fix up reqs

gnome-vfs2.spec

@@ -1,5 +1,5 @@
 %define samba_version 3.0.8-0.pre1.3
-%define gconf2_version 1.2.0
+%define gconf2_version 2.14
 %define gtkdoc_version 0.9
 %define gnome_mime_data_version 2.0.0-11
 %define perl_XML_Parser_version 2.31-16
@@ -13,7 +13,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.16.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -23,6 +23,7 @@ Requires:      gnome-mime-data >= %{gnome_mime_data_version}
 Requires:      shared-mime-info
 Requires:      gnome-mount >= %{gnome_mount_version}
 Requires(post): GConf2 >= %{gconf2_version}
+Requires(preun): GConf2 >= %{gconf2_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: gnome-mime-data >= %{gnome_mime_data_version}
 BuildRequires: libxml2-devel, zlib-devel
@@ -84,6 +85,7 @@ Requires:   GConf2-devel >= %{gconf2_version}
 Requires:   hal-devel >= %{hal_version}
 Requires:   dbus-devel >= %{dbus_version}
 Requires:   dbus-glib-devel >= %{dbus_glib_version}
+Requires:   pkgconfig
 Conflicts: gnome-vfs-devel < 1.0.2
 
 %description devel
@@ -163,11 +165,25 @@ rm -fr %{buildroot}
 %post
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="system_http_proxy.schemas system_dns_sd.schemas system_smb.schemas desktop_gnome_url_handlers.schemas desktop_default_applications.schemas"
+gconftool-2 --makefile-install-rule \
-for S in $SCHEMAS; do
+    %{_sysconfdir}/gconf/schemas/system_http_proxy.schemas \
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
+    %{_sysconfdir}/gconf/schemas/system_dns_sd.schemas \
-done
+    %{_sysconfdir}/gconf/schemas/system_smb.schemas \
-
+    %{_sysconfdir}/gconf/schemas/desktop_gnome_url_handlers.schemas \
+    %{_sysconfdir}/gconf/schemas/desktop_default_applications.schemas \
+      > /dev/null || :
+
+%preun
+if [ "$1" -gt 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule \
+    %{_sysconfdir}/gconf/schemas/system_http_proxy.schemas \
+    %{_sysconfdir}/gconf/schemas/system_dns_sd.schemas \
+    %{_sysconfdir}/gconf/schemas/system_smb.schemas \
+    %{_sysconfdir}/gconf/schemas/desktop_gnome_url_handlers.schemas \
+    %{_sysconfdir}/gconf/schemas/desktop_default_applications.schemas \
+      > /dev/null || :
+fi
 
 %postun -p /sbin/ldconfig
 
@@ -192,7 +208,6 @@ done
 
 %files devel
 %defattr(-, root, root)
-%{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_libdir}/gnome-vfs-2.0/include
@@ -205,6 +220,11 @@ done
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Tue Oct 17 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.0-5
+- Tighten up Requires (#203813)
+- Require pkgconfig in the -devel package
+- Don't ship static libraries
+
 * Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 2.16.0-4
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21