packages: gnome-vfs2/gnome-vfs2.spec, gnome-vfs2/gnome-vfs2-ac-libs.patch (...
baggins
baggins at pld-linux.org
Wed Aug 3 12:27:47 CEST 2011
Author: baggins Date: Wed Aug 3 10:27:47 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- fix /usr/lib pollution
---- Files affected:
packages/gnome-vfs2:
gnome-vfs2.spec (1.222 -> 1.223) , gnome-vfs2-ac-libs.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/gnome-vfs2/gnome-vfs2.spec
diff -u packages/gnome-vfs2/gnome-vfs2.spec:1.222 packages/gnome-vfs2/gnome-vfs2.spec:1.223
--- packages/gnome-vfs2/gnome-vfs2.spec:1.222 Wed Aug 3 10:21:29 2011
+++ packages/gnome-vfs2/gnome-vfs2.spec Wed Aug 3 12:27:42 2011
@@ -7,7 +7,7 @@
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
@@ -17,6 +17,7 @@
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
@@ -125,6 +126,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p0
+%patch4 -p1
%build
# force rebuild
@@ -248,6 +250,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.223 2011/08/03 10:27:42 baggins
+- fix /usr/lib pollution
+
Revision 1.222 2011/08/03 08:21:29 baggins
- release 8
================================================================
Index: packages/gnome-vfs2/gnome-vfs2-ac-libs.patch
diff -u /dev/null packages/gnome-vfs2/gnome-vfs2-ac-libs.patch:1.1
--- /dev/null Wed Aug 3 12:27:47 2011
+++ packages/gnome-vfs2/gnome-vfs2-ac-libs.patch Wed Aug 3 12:27:42 2011
@@ -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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-vfs2/gnome-vfs2.spec?r1=1.222&r2=1.223&f=u
More information about the pld-cvs-commit
mailing list