- Merge-review cleanup (#225843)

gnome-vfs2.spec

@@ -1,20 +1,9 @@
-%define samba_version 3.0.8-0.pre1.3
-%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
 %define po_package gnome-vfs-2.0
-# %define gnome_mount_version 0.4
-%define glib2_version 2.9.3
-%define dbus_version 0.90
-%define dbus_glib_version 0.70
-%define hal_version 0.5.7
-%define avahi_version 0.6
 
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.24.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+
@@ -22,33 +11,27 @@ Group: System Environment/Libraries
 #VCS: git:git://git.gnome.org/gnome-vfs
 Source0: http://download.gnome.org/sources/gnome-vfs/2.24/gnome-vfs-%{version}.tar.bz2
 URL: http://www.gnome.org/
-# Requires:      gnome-mime-data >= %{gnome_mime_data_version}
-Requires:      shared-mime-info
-# Requires:      gnome-mount >= %{gnome_mount_version}
-Requires:      GConf2 >= %{gconf2_version}
-Requires(post): GConf2 >= %{gconf2_version}
-Requires(pre): GConf2 >= %{gconf2_version}
-Requires(preun): GConf2 >= %{gconf2_version}
-BuildRequires: GConf2-devel >= %{gconf2_version}
-# BuildRequires: gnome-mime-data >= %{gnome_mime_data_version}
+Requires(post): GConf2 
+Requires(pre): GConf2 
+Requires(preun): GConf2 
+BuildRequires: GConf2-devel 
 BuildRequires: libxml2-devel, zlib-devel
-BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: glib2-devel 
 BuildRequires: popt, bzip2-devel, ORBit2-devel, openjade
 BuildRequires: pkgconfig
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: intltool
 BuildRequires: autoconf
-BuildRequires: gtk-doc >= %{gtkdoc_version}
-BuildRequires: perl-XML-Parser >= %{perl_XML_Parser_version}
-BuildRequires: libsmbclient-devel >= %{samba_version}
+BuildRequires: gtk-doc 
+BuildRequires: perl-XML-Parser 
+BuildRequires: libsmbclient-devel 
 BuildRequires: openssl-devel gamin-devel
 BuildRequires: krb5-devel
-BuildRequires: avahi-glib-devel >= %{avahi_version}
-BuildRequires: hal-devel >= %{hal_version}
-BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-# BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
+BuildRequires: avahi-glib-devel 
+BuildRequires: hal-devel 
+BuildRequires: dbus-devel 
+BuildRequires: dbus-glib-devel 
 BuildRequires: gettext
 BuildRequires: libacl-devel
 BuildRequires: libselinux-devel
@@ -102,12 +85,6 @@ library, and other features.
 Summary: Libraries and include files for developing GNOME VFS applications
 Group: Development/Libraries
 Requires:   %{name} = %{version}-%{release}
-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
 This package provides the necessary development libraries for writing
@@ -117,9 +94,7 @@ GNOME VFS modules and applications that use the GNOME VFS APIs.
 Summary: Windows fileshare support for gnome-vfs
 Group: System Environment/Libraries
 Requires:   %{name} = %{version}-%{release}
-Requires: libsmbclient >= %{samba_version}
-Obsoletes:     gnome-vfs2-extras
-Provides:     gnome-vfs2-extras
+Requires: libsmbclient
 
 %description smb
 This package provides support for reading and writing files on windows
@@ -150,16 +125,15 @@ autoheader
 autoconf
 
 %build
-
 if pkg-config openssl ; then
 	CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS
 	LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS
 fi
 
-%configure --disable-gtk-doc --enable-hal 
-
-export tagname=CC
-make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
+%configure --disable-gtk-doc --enable-hal --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags}
 
 # strip unneeded translations from .mo files
 # ideally intltool (ha!) would do that for us
@@ -178,65 +152,42 @@ done
 
 
 %install
-rm -fr $RPM_BUILD_ROOT
-
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-export tagname=CC
-make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/lib*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/lib*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %find_lang %{po_package}
 
-%clean
-rm -fr %{buildroot}
 
 %post
 /sbin/ldconfig
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-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 || :
+%gconf_schema_upgrade system_http_proxy.schemas \
+ system_dns_sd.schemas \
+ system_smb.schemas \
+ desktop_gnome_url_handlers.schemas \
+ desktop_default_applications.schemas
 
 %pre
-if [ "$1" -gt 1 ]; 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
+%gconf_schema_prepare system_http_proxy.schemas \
+ system_dns_sd.schemas \
+ system_smb.schemas \
+ desktop_gnome_url_handlers.schemas \
+ desktop_default_applications.schemas
 
 %preun
-if [ "$1" -eq 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
+%gconf_schema_remove system_http_proxy.schemas \
+ system_dns_sd.schemas \
+ system_smb.schemas \
+ desktop_gnome_url_handlers.schemas \
+ desktop_default_applications.schemas 
 
 %postun -p /sbin/ldconfig
 
 %files -f %{po_package}.lang
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING COPYING.LIB NEWS README
-
 %dir %{_sysconfdir}/gnome-vfs-2.0
 %dir %{_sysconfdir}/gnome-vfs-2.0/modules
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/*.conf
@@ -249,11 +200,9 @@ fi
 %dir %{_libdir}/gnome-vfs-2.0
 %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/dbus-1/services/gnome-vfs-daemon.service
-## conflicts with gnome-vfs 1, ignore for now
-## %{_datadir}/man/man5/*
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root, root,-)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_libdir}/gnome-vfs-2.0/include
@@ -261,11 +210,14 @@ fi
 %{_datadir}/gtk-doc/html/gnome-vfs-2.0
 
 %files smb
-%defattr(-, root, root)
+%defattr(-, root, root,-)
 %{_libdir}/gnome-vfs-2.0/modules/libsmb.so
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Fri Oct 15 2010 Parag Nemade <paragn AT fedoraproject.org> - 2.24.4-2
+- Merge-review cleanup (#225843)
+
 * Tue Sep 28 2010 Matthias Clasen <mclasen@redhat.com> - 2.24.4-1
 - Update to 2.24.4