rpms/gnome-vfs2/OLPC-2 gnome-vfs2.spec,1.157,1.158

[John (J5) Palmieri (johnp)]

Author: johnp

Update of /cvs/extras/rpms/gnome-vfs2/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11263

Modified Files:
	gnome-vfs2.spec 
Log Message:
- Build for OLPC
- Remove gnome-mount dependency
- Remove keyutils dependency



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfs2/OLPC-2/gnome-vfs2.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- gnome-vfs2.spec	8 May 2007 09:12:40 -0000	1.157
+++ gnome-vfs2.spec	18 Jun 2007 18:29:32 -0000	1.158
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.18.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: http://ftp.gnome.org/pub/gnome/source/gnome-vfs/2.17/gnome-vfs-%{version}.tar.bz2
@@ -22,16 +22,15 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 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}
+Requires:      GConf2-dbus >= %{gconf2_version}
+Requires(post): GConf2-dbus >= %{gconf2_version}
+Requires(pre): GConf2-dbus >= %{gconf2_version}
+Requires(preun): GConf2-dbus >= %{gconf2_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: gnome-mime-data >= %{gnome_mime_data_version}
 BuildRequires: libxml2-devel, zlib-devel
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: popt, bzip2-devel, ORBit2-devel, openjade
+BuildRequires: popt, bzip2-devel, openjade
 BuildRequires: pkgconfig
 BuildRequires: automake
 BuildRequires: libtool
@@ -46,11 +45,9 @@
 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: gettext
 BuildRequires: libacl-devel
 BuildRequires: libselinux-devel
-BuildRequires: keyutils-libs-devel
 
 Patch3: gnome-vfs-2.9.90-modules-conf.patch
 
@@ -88,7 +85,7 @@
 Summary: Libraries and include files for developing GNOME VFS applications
 Group: Development/Libraries
 Requires:   %{name} = %{version}-%{release}
-Requires:   GConf2-devel >= %{gconf2_version}
+Requires:   GConf2-dbus-devel >= %{gconf2_version}
 Requires:   hal-devel >= %{hal_version}
 Requires:   dbus-devel >= %{dbus_version}
 Requires:   dbus-glib-devel >= %{dbus_glib_version}
@@ -140,7 +137,7 @@
 fi
 
 CFLAGS="-O0 -g"
-%configure --disable-gtk-doc --enable-hal 
+%configure --disable-gtk-doc --with-gtk=no --enable-hal 
 
 export tagname=CC
 make LIBTOOL=/usr/bin/libtool
@@ -234,6 +231,11 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Mon Jun 18 2007  <johnp at redhat.com> - 2.18.1-5
+- Build for OLPC
+- Remove gnome-mount dependency
+- Remove keyutils dependency
+
 * Tue May  8 2007  <alexl at redhat.com> - 2.18.1-4
 - Add keyutils-libs-devel build requires