packages: icedove/icedove.spec - dropped gnome-vfs2, enabled gio

[qboosh]

Author: qboosh                       Date: Sat Jan 21 21:12:26 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- dropped gnome-vfs2, enabled gio

---- Files affected:
packages/icedove:
   icedove.spec (1.138 -> 1.139) 

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.138 packages/icedove/icedove.spec:1.139
--- packages/icedove/icedove.spec:1.138	Sat Jan 21 19:07:11 2012
+++ packages/icedove/icedove.spec	Sat Jan 21 22:12:21 2012
@@ -2,16 +2,14 @@
 # TODO:
 # - separate spec for enigmail
 # - build with system mozldap
-# - replace gnome-vfs2 with gio
 # - files:
-#   /usr/lib/icedove/hyphenation/hyph_en_US.dic
+#   /usr/lib/icedove/hyphenation/hyph_en_US.dic (and more, more hyph dicts)
 # - enigmail - new version needed
 #
 # Conditional builds
 %bcond_without	enigmail	# don't build enigmail - GPG/PGP support
 %bcond_without	gnomeui		# disable gnomeui support
-%bcond_without	gnomevfs	# disable GNOME comp. (gconf+libgnome+gnomevfs) and gnomevfs ext.
-%bcond_without	gnome		# disable all GNOME components (gnome+gnomeui+gnomevfs)
+%bcond_without	gnome		# alias for gnomeui
 %bcond_without	ldap		# disable e-mail address lookups in LDAP directories
 %bcond_without	lightning	# disable Sunbird/Lightning calendar
 %bcond_without	xulrunner	# build with xulrunner
@@ -19,7 +17,6 @@
 
 %if %{without gnome}
 %undefine	with_gnomeui
-%undefine	with_gnomevfs
 %endif
 
 %if 0%{?_enable_debug_packages} != 1
@@ -69,18 +66,18 @@
 Patch11:	crashreporter.patch
 Patch12:	no-subshell.patch
 URL:		http://www.pld-linux.org/Packages/Icedove
-%{?with_gnomevfs:BuildRequires:	GConf2-devel >= 1.2.1}
+BuildRequires:	GConf2-devel >= 1.2.1
 BuildRequires:	alsa-lib-devel
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
 BuildRequires:	cairo-devel >= 1.10
 BuildRequires:	dbus-glib-devel >= 0.60
 BuildRequires:	freetype-devel >= 1:2.1.8
-%{?with_gnomevfs:BuildRequires:	gnome-vfs2-devel >= 2.0}
+BuildRequires:	glib2-devel >= 2.0
 BuildRequires:	gtk+2-devel >= 2:2.10.0
 BuildRequires:	hunspell-devel
 BuildRequires:	libIDL-devel >= 0.8.0
-%{?with_gnomevfs:BuildRequires:	libgnome-devel >= 2.0}
+%{?with_gnomeui:BuildRequires:	libgnome-devel >= 2.0}
 %{?with_gnomeui:BuildRequires:	libgnome-keyring-devel}
 %{?with_gnomeui:BuildRequires:	libgnomeui-devel >= 2.2.0}
 BuildRequires:	libiw-devel
@@ -261,16 +258,13 @@
 %else
 ac_add_options --disable-tests
 %endif
+ac_add_options --enable-gio
 %if %{with gnomeui}
 ac_add_options --enable-gnomeui
 %else
 ac_add_options --disable-gnomeui
 %endif
-%if %{with gnomevfs}
-ac_add_options --enable-gnomevfs
-%else
 ac_add_options --disable-gnomevfs
-%endif
 %if %{with ldap}
 ac_add_options --enable-ldap
 ac_add_options --with-system-ldap
@@ -568,6 +562,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.139  2012/01/21 21:12:21  qboosh
+- dropped gnome-vfs2, enabled gio
+
 Revision 1.138  2012/01/21 18:07:11  qboosh
 - added libpng patch to fix build with libpng 1.5.x
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove.spec?r1=1.138&r2=1.139&f=u