rpms/gnome-vfs2/devel gnome-vfs2.spec,1.104,1.105

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11076

Modified Files:
	gnome-vfs2.spec 
Log Message:
2.14.1



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- gnome-vfs2.spec	21 Apr 2006 12:49:30 -0000	1.104
+++ gnome-vfs2.spec	21 Apr 2006 14:56:12 -0000	1.105
@@ -8,7 +8,7 @@
 %define gnome_mount_version 0.4
 %define glib2_version 2.9.3
 
-Summary: The GNOME virtual file-system libraries.
+Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.14.1
 Release: 2
@@ -21,6 +21,7 @@
 Requires:      gnome-mime-data >= %{gnome_mime_data_version}
 Requires:      shared-mime-info
 Requires:      gnome-mount >= %{gnome_mount_version}
+Requires(post): GConf2 >= %{gconf2_version}
 BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: gnome-mime-data >= %{gnome_mime_data_version}
@@ -29,6 +30,9 @@
 BuildRequires: popt, bzip2-devel, ORBit2-devel, openjade
 BuildRequires: pkgconfig
 BuildRequires: /usr/bin/automake-1.9
+BuildRequires: libtool
+BuildRequires: intltool
+BuildRequires: autoconf
 BuildRequires: gtk-doc >= %{gtkdoc_version}
 BuildRequires: perl-XML-Parser >= %{perl_XML_Parser_version}
 BuildRequires: samba-common >= %{samba_version}
@@ -37,7 +41,6 @@
 BuildRequires: avahi-glib-devel >= 0.6
 BuildRequires: hal-devel >= 0.5.0
 BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
-Prereq: GConf2 >= %{gconf2_version}
 
 Patch3: gnome-vfs-2.9.90-modules-conf.patch
 
@@ -58,9 +61,9 @@
 library, and other features.
 
 %package devel
-Summary: Libraries and include files for developing GNOME VFS applications.
+Summary: Libraries and include files for developing GNOME VFS applications
 Group: Development/Libraries
-Requires:   %{name} = %{version}
+Requires:   %{name} = %{version}-%{release}
 Requires:   GConf2-devel >= %{gconf2_version}
 Requires:   libbonobo-devel >= %{libbonobo_version}
 Conflicts: bonobo-devel < 1.0.8
@@ -73,7 +76,7 @@
 %package smb
 Summary: Windows fileshare support for gnome-vfs
 Group: System Environment/Libraries
-Requires:   %{name} = %{version}
+Requires:   %{name} = %{version}-%release}
 Requires: samba-common >= %{samba_version}
 Obsoletes:     gnome-vfs2-extras
 Provides:     gnome-vfs2-extras
@@ -115,7 +118,7 @@
 make LIBTOOL=/usr/bin/libtool
 
 %install
-rm -fr %{buildroot}
+rm -fr $RPM_BUILD_ROOT
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 export tagname=CC
@@ -138,14 +141,13 @@
 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"
 for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
 done
 
-/sbin/ldconfig
 
 %postun -p /sbin/ldconfig