- fix /usr/lib pollution

Changed files:
    gnome-vfs2-ac-libs.patch -> 1.1
    gnome-vfs2.spec -> 1.223

diff --git a/gnome-vfs2-ac-libs.patch b/gnome-vfs2-ac-libs.patch
new file mode 100644 (file)
index 0000000..2c95c94
--- /dev/null
+++ b/gnome-vfs2-ac-libs.patch
@@ -0,0 +1,45 @@
+--- gnome-vfs-2.24.4/configure.in~     2011-08-03 12:25:39.350782218 +0200
++++ gnome-vfs-2.24.4/configure.in      2011-08-03 12:26:57.897782199 +0200
+@@ -565,14 +565,13 @@
+   if test "x${with_samba_libs}" != "xno" -a "x${have_samba_includes}" != "xno"; then
+       LDFLAGS_save="$LDFLAGS"
+       
+-      LDFLAGS="$LDFLAGS -L$with_samba_libs"
+       AC_CHECK_LIB(smbclient, smbc_new_context,samba_libs="yes", samba_libs="no")
+       LDFLAGS="$LDFLAGS_save"
+       if test "x${samba_libs}" != "xno"; then
+               AC_DEFINE(HAVE_SAMBA,, [Define to 1 if you have the samba 3.0 libraries])
+               msg_samba="yes"
+                 if test x$with_samba_libs != x/usr/lib; then
+-                        SAMBA_LIBS="-L$with_samba_libs -lsmbclient"
++                        SAMBA_LIBS="-lsmbclient"
+                 else
+                       SAMBA_LIBS="-lsmbclient"
+                 fi
+@@ -641,7 +640,7 @@
+       [
+ dnl How can we test to see if we need to link to libld for sure?? 
+ dnl RedHat 6.2 seems to need to but Debian Woody doesn't
+-              LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
++              LDFLAGS="$LDFLAGS -lssl -lcrypto -ldl"
+               AC_TRY_LINK_FUNC(SSL_read, openssl_libs="yes", openssl_libs="no")
+               LDFLAGS="$LDFLAGS_save"
+       ])
+@@ -649,7 +648,7 @@
+               AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if OpenSSL is available])
+               msg_openssl="yes"
+                 if test x$with_openssl_libs != x/usr/lib; then
+-                        OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcrypto"
++                        OPENSSL_LIBS="-lssl -lcrypto"
+                 else
+                       OPENSSL_LIBS="-lssl -lcrypto"
+                 fi
+@@ -1265,7 +1264,7 @@
+ [  --with-afs              support -fstype afs],
+ [  AC_DEFINE(AFS, [], [Define if you have the Andrew File System])
+   CPPFLAGS="$CPPFLAGS -I/usr/afsws/include"
+-  LIBS="$LIBS -L/usr/afsws/lib -L/usr/afsws/lib/afs -lsys -lrx -llwp"])
++  LIBS="$LIBS -lsys -lrx -llwp"])
+ 
+ AC_MSG_CHECKING(how to get filesystem type)
+ fstype=no

diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index 2ae5408ca17f2479a23c895522f9c7e342fdc09f..e883a71d608a9b50bdd53e4100e6c54e1f2c6f99 100644 (file)
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -6,7 +6,7 @@ Summary:        GNOME - virtual file system
 Summary(pl.UTF-8):     GNOME - wirtualny system plików
 Name:          gnome-vfs2
 Version:       2.24.4
-Release:       8
+Release:       8.1
 License:       LGPL v2+
 Group:         Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.24/gnome-vfs-%{version}.tar.bz2
@@ -16,6 +16,7 @@ Patch0:               %{name}-no_g_mime.patch
 Patch1:                %{name}-fstab_edit_crash.patch
 Patch2:                %{name}-default_cdda_handler.patch
 Patch3:                %{name}-headers-define.patch
+Patch4:                %{name}-ac-libs.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.22.0
 BuildRequires: ORBit2-devel >= 1:2.14.9
@@ -124,6 +125,7 @@ Dokumentacja API gnome-vfs.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p0
+%patch4 -p1
 
 %build
 # force rebuild