rpms/gnome-vfs2/devel gnome-vfs-2.24.1-disable-gnome-mime-data.patch, NONE, 1.1 gnome-vfs2.spec, 1.195, 1.196

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/gnome-vfs2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3473

Modified Files:
	gnome-vfs2.spec 
Added Files:
	gnome-vfs-2.24.1-disable-gnome-mime-data.patch 
Log Message:
* Fri Aug 14 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.1-8
- Drop gnome-mount and gnome-mime-data dependencies


gnome-vfs-2.24.1-disable-gnome-mime-data.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-vfs-2.24.1-disable-gnome-mime-data.patch ---
diff -up gnome-vfs-2.24.1/configure.in.orig gnome-vfs-2.24.1/configure.in
--- gnome-vfs-2.24.1/configure.in.orig	2009-03-17 14:48:24.000000000 +0100
+++ gnome-vfs-2.24.1/configure.in	2009-08-14 14:00:49.000000000 +0200
@@ -1044,7 +1044,7 @@ dnl ====================================
 dnl End of IPv6 checks
 dnl ==============================================================================
 
-PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement)
+PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED $dbus_requirement)
 LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
 LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
 AC_SUBST(LIBGNOMEVFS_CFLAGS)


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- gnome-vfs2.spec	10 Aug 2009 08:36:06 -0000	1.195
+++ gnome-vfs2.spec	14 Aug 2009 13:03:20 -0000	1.196
@@ -1,10 +1,10 @@
 %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 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 gnome_mount_version 0.4
 %define glib2_version 2.9.3
 %define dbus_version 0.90
 %define dbus_glib_version 0.70
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.24.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+ 
@@ -22,15 +22,15 @@ Group: System Environment/Libraries
 Source0: http://download.gnome.org/sources/gnome-vfs/2.24/gnome-vfs-%{version}.tar.bz2
 URL: http://www.gnome.org/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-Requires:      gnome-mime-data >= %{gnome_mime_data_version}
+# Requires:      gnome-mime-data >= %{gnome_mime_data_version}
 Requires:      shared-mime-info
-Requires:      gnome-mount >= %{gnome_mount_version}
+# 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}
+# 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
@@ -48,7 +48,7 @@ BuildRequires: avahi-glib-devel >= %{ava
 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: gnome-mount-devel >= %{gnome_mount_version} 
 BuildRequires: gettext
 BuildRequires: libacl-devel
 BuildRequires: libselinux-devel
@@ -56,6 +56,9 @@ BuildRequires: keyutils-libs-devel
 
 Patch3: gnome-vfs-2.9.90-modules-conf.patch
 
+# remove gnome-mime-data dependency
+Patch4: gnome-vfs-2.24.1-disable-gnome-mime-data.patch
+
 # send to upstream
 Patch101:	gnome-vfs-2.8.2-schema_about_for_upstream.patch
 
@@ -123,6 +126,7 @@ shares (SMB) to applications using GNOME
 %setup -q -n gnome-vfs-%{version} 
 
 %patch3 -p1 -b .modules-conf
+%patch4 -p1 -b .mime-data
 
 %patch6 -p1 -b .mailto-command
 
@@ -139,7 +143,7 @@ shares (SMB) to applications using GNOME
 %patch403 -p1 -b .uninitialized-struct
 %patch404 -p1 -b .utf8-mounts
 
-# for patch 10
+# for patch 10 and 4
 autoheader
 autoconf
 
@@ -260,6 +264,9 @@ fi
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Fri Aug 14 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.24.1-8
+- Drop gnome-mount and gnome-mime-data dependencies
+
 * Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.24.1-7
 - Convert specfile to UTF-8.