packages: iceweasel/iceweasel.spec - updated wrt. gnomevfs->gio transition

[qboosh]

Author: qboosh                       Date: Mon Oct 17 16:32:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated wrt. gnomevfs->gio transition

---- Files affected:
packages/iceweasel:
   iceweasel.spec (1.160 -> 1.161) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.160 packages/iceweasel/iceweasel.spec:1.161
--- packages/iceweasel/iceweasel.spec:1.160	Sat Oct  1 00:23:40 2011
+++ packages/iceweasel/iceweasel.spec	Mon Oct 17 18:32:09 2011
@@ -3,8 +3,7 @@
 # Conditional build:
 %bcond_with	tests		# enable tests (whatever they check)
 %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		# synonym for gnomeui (gconf, libnotify and gio are still enabled)
 %bcond_without	kerberos	# disable krb5 support
 %if "%{pld_release}" == "ti"
 %bcond_with	xulrunner	# build with system xulrunner
@@ -14,7 +13,6 @@
 
 %if %{without gnome}
 %undefine	with_gnomeui
-%undefine	with_gnomevfs
 %endif
 
 # convert firefox release number to platform version: 6.0.x -> 6.0.x
@@ -60,14 +58,13 @@
 BuildRequires:	bzip2-devel
 BuildRequires:	cairo-devel >= 1.10.2-5
 BuildRequires:	dbus-glib-devel >= 0.60
-%{?with_gnomevfs:BuildRequires:	gnome-vfs2-devel >= 2.0}
+BuildRequires:	glib2-devel >= 1:2.18
 BuildRequires:	gtk+2-devel >= 2:2.10
 %{?with_kerberos:BuildRequires:	heimdal-devel >= 0.7.1}
 BuildRequires:	hunspell-devel
 BuildRequires:	libIDL-devel >= 0.8.0
 BuildRequires:	libdnet-devel
 BuildRequires:	libevent-devel >= 1.4.7
-%{?with_gnomevfs:BuildRequires:	libgnome-devel >= 2.0}
 %{?with_gnomeui:BuildRequires:	libgnomeui-devel >= 2.2.0}
 BuildRequires:	libiw-devel
 BuildRequires:	libjpeg-devel >= 6b
@@ -76,8 +73,8 @@
 BuildRequires:	libpng-devel >= 1.4.1
 BuildRequires:	libstdc++-devel
 BuildRequires:	libvpx-devel
-BuildRequires:	nspr-devel >= 1:4.8.7
-BuildRequires:	nss-devel >= 1:3.12.9
+BuildRequires:	nspr-devel >= 1:4.8.8
+BuildRequires:	nss-devel >= 1:3.12.10
 BuildRequires:	pango-devel >= 1:1.14.0
 BuildRequires:	perl-modules >= 5.004
 BuildRequires:	pkgconfig
@@ -88,9 +85,7 @@
 BuildRequires:	startup-notification-devel >= 0.8
 BuildRequires:	xorg-lib-libXScrnSaver-devel
 BuildRequires:	xorg-lib-libXext-devel
-BuildRequires:	xorg-lib-libXft-devel >= 2.1
 BuildRequires:	xorg-lib-libXinerama-devel
-BuildRequires:	xorg-lib-libXp-devel
 BuildRequires:	xorg-lib-libXt-devel
 %if %{with xulrunner}
 BuildRequires:	xulrunner-devel >= 2:%{xulrunner_ver}
@@ -110,8 +105,8 @@
 Requires:	libpng >= 1.4.1
 Requires:	libpng(APNG) >= 0.10
 Requires:	myspell-common
-Requires:	nspr >= 1:4.8.7
-Requires:	nss >= 1:3.12.9
+Requires:	nspr >= 1:4.8.8
+Requires:	nss >= 1:3.12.10
 Requires:	pango >= 1:1.14.0
 Requires:	sqlite3 >= %{sqlite_build_version}
 Requires:	startup-notification >= 0.8
@@ -489,11 +484,9 @@
 %attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so
 %endif
 
-%if %{with gnomevfs}
 %if %{without xulrunner}
 %attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so
 %endif
-%endif
 
 %attr(755,root,root) %{_libdir}/%{name}/iceweasel
 %dir %{_libdir}/%{name}/plugins
@@ -516,8 +509,7 @@
 %{_libdir}/%{name}/searchplugins
 %if %{with xulrunner}
 %{_libdir}/%{name}/xulrunner
-%endif
-%if %{without xulrunner}
+%else
 %{_libdir}/%{name}/dictionaries
 %{_libdir}/%{name}/greprefs.js
 %{_libdir}/%{name}/res
@@ -550,6 +542,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.161  2011/10/17 16:32:09  qboosh
+- updated wrt. gnomevfs->gio transition
+
 Revision 1.160  2011/09/30 22:23:40  arekm
 - up to 7.0.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel.spec?r1=1.160&r2=1.161&f=u