- merged from HEAD

Changed files:
    gnome-vfs2-no_g_mime.patch -> 1.2.2.1

diff --git a/gnome-vfs2-no_g_mime.patch b/gnome-vfs2-no_g_mime.patch
index fbaf03a6f2f39411244cd1525228e9a469197d35..b3dc6bef044c7b107a9a43db4d587ccdb786ef3f 100644 (file)
--- a/gnome-vfs2-no_g_mime.patch
+++ b/gnome-vfs2-no_g_mime.patch
@@ -1,12 +1,11 @@
-diff -aurN gnome-vfs-2.11.3.orig/configure.in gnome-vfs-2.11.3/configure.in
---- gnome-vfs-2.11.3.orig/configure.in 2005-06-30 11:17:20.000000000 +0200
-+++ gnome-vfs-2.11.3/configure.in      2005-07-03 17:07:33.000000000 +0200
-@@ -972,7 +972,7 @@
+--- gnome-vfs-2.13.3/configure.in.orig 2006-01-05 14:17:03.903057750 +0100
++++ gnome-vfs-2.13.3/configure.in      2006-01-05 14:17:15.427778000 +0100
+@@ -985,7 +985,7 @@
  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 bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0)
 +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 bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED libbonobo-2.0 >= $BONOBO_REQUIRED ORBit-2.0 >= $ORBIT_REQUIRED libxml-2.0 >= $XML_REQUIRED)
- LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS"
- LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $RESOLVER_LIBS"
+ 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)