packages: gnutls/gnutls.spec, gnutls/gnutls-link.patch - added link patch t...

[qboosh]

Author: qboosh                       Date: Mon Feb  1 16:33:14 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added link patch to avoid forcing -L%{_libdir}; dumb BC dropped now
- release 2

---- Files affected:
packages/gnutls:
   gnutls.spec (1.108 -> 1.109) , gnutls-link.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/gnutls/gnutls.spec
diff -u packages/gnutls/gnutls.spec:1.108 packages/gnutls/gnutls.spec:1.109
--- packages/gnutls/gnutls.spec:1.108	Mon Nov  2 17:26:34 2009
+++ packages/gnutls/gnutls.spec	Mon Feb  1 17:33:08 2010
@@ -3,12 +3,13 @@
 Summary(pl.UTF-8):	Biblioteka GNU TLS (Transport Layer Security)
 Name:		gnutls
 Version:	2.8.5
-Release:	1
+Release:	2
 License:	LGPL v2.1+ (libgnutls), GPL v3+ (extra libs and tools)
 Group:		Libraries
 Source0:	ftp://ftp.gnutls.org/pub/gnutls/%{name}-%{version}.tar.bz2
 # Source0-md5:	e3b2788b79bfc82acbe717e3c54d4e92
 Patch0:		%{name}-info.patch
+Patch1:		%{name}-link.patch
 URL:		http://www.gnu.org/software/gnutls/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake >= 1:1.10.2-2
@@ -28,7 +29,6 @@
 BuildRequires:	rpmbuild(macros) >= 1.383
 BuildRequires:	texinfo >= 4.8
 BuildRequires:	zlib-devel
-BuildConflicts:	gnutls-devel
 Requires(post,postun):	/sbin/ldconfig
 Requires:	libgcrypt >= 1.2.4
 Requires:	libtasn1 >= 1.5
@@ -136,6 +136,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -249,6 +250,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.109  2010/02/01 16:33:08  qboosh
+- added link patch to avoid forcing -L%{_libdir}; dumb BC dropped now
+- release 2
+
 Revision 1.108  2009/11/02 16:26:34  adamg
 - updated to 2.8.5
 

================================================================
Index: packages/gnutls/gnutls-link.patch
diff -u /dev/null packages/gnutls/gnutls-link.patch:1.3
--- /dev/null	Mon Feb  1 17:33:14 2010
+++ packages/gnutls/gnutls-link.patch	Mon Feb  1 17:33:08 2010
@@ -0,0 +1,14 @@
+--- gnutls-2.8.5/lib/m4/lib-link.m4.orig	2009-11-02 11:34:50.000000000 +0100
++++ gnutls-2.8.5/lib/m4/lib-link.m4	2010-01-31 19:56:56.126778128 +0100
+@@ -322,7 +322,11 @@
+           fi
+           if test "X$found_dir" != "X"; then
+             dnl Found the library.
++            if test "X$found_dir" = "X/usr/$acl_libdirstem"; then
++                LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
++	    else
+             LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
++	    fi
+             if test "X$found_so" != "X"; then
+               dnl Linking with a shared library. We attempt to hardcode its
+               dnl directory into the executable's runpath, unless it's the
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnutls/gnutls.spec?r1=1.108&r2=1.109&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnutls/gnutls-link.patch?r1=1.2&r2=1.3&f=u