packages: gnutls/gnutls-link.patch, gnutls/gnutls.spec, gnutls/gnutls-pakch...

[qboosh]

Author: qboosh                       Date: Sat Apr  2 09:35:22 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- pakchois patch to fix system pakchois check
- more fixes in link patch to link with built libgnutls instead of installed

---- Files affected:
packages/gnutls:
   gnutls-link.patch (1.3 -> 1.4) , gnutls.spec (1.119 -> 1.120) , gnutls-pakchois.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gnutls/gnutls-link.patch
diff -u packages/gnutls/gnutls-link.patch:1.3 packages/gnutls/gnutls-link.patch:1.4
--- packages/gnutls/gnutls-link.patch:1.3	Mon Feb  1 17:33:08 2010
+++ packages/gnutls/gnutls-link.patch	Sat Apr  2 11:35:16 2011
@@ -12,3 +12,31 @@
              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
+--- gnutls-2.12.0/m4/lib-link.m4.orig	2008-05-17 07:44:04.000000000 +0200
++++ gnutls-2.12.0/m4/lib-link.m4	2011-04-02 11:29:18.159546509 +0200
+@@ -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
+--- gnutls-2.12.0/libextra/gl/m4/lib-link.m4.orig	2011-03-02 18:39:14.000000000 +0100
++++ gnutls-2.12.0/libextra/gl/m4/lib-link.m4	2011-04-02 11:29:43.620681483 +0200
+@@ -370,7 +370,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

================================================================
Index: packages/gnutls/gnutls.spec
diff -u packages/gnutls/gnutls.spec:1.119 packages/gnutls/gnutls.spec:1.120
--- packages/gnutls/gnutls.spec:1.119	Sat Apr  2 08:39:36 2011
+++ packages/gnutls/gnutls.spec	Sat Apr  2 11:35:16 2011
@@ -11,6 +11,7 @@
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-link.patch
 Patch2:		%{name}-notestsuite.patch
+Patch3:		%{name}-pakchois.patch
 URL:		http://www.gnu.org/software/gnutls/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake >= 1:1.10.2-2
@@ -143,6 +144,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -155,6 +157,11 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+cd ../libextra
+%{__aclocal} -I m4 -I gl/m4 -I ../lib/m4 -I ../lib/gl/m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 cd ..
 %configure \
 	--disable-silent-rules \
@@ -267,6 +274,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.120  2011/04/02 09:35:16  qboosh
+- pakchois patch to fix system pakchois check
+- more fixes in link patch to link with built libgnutls instead of installed
+
 Revision 1.119  2011/04/02 06:39:36  qboosh
 - updated to 2.12.0 (note: new libgnutls-openssl and libgnutlsxx sonames)
 - updated info patch

================================================================
Index: packages/gnutls/gnutls-pakchois.patch
diff -u /dev/null packages/gnutls/gnutls-pakchois.patch:1.1
--- /dev/null	Sat Apr  2 11:35:22 2011
+++ packages/gnutls/gnutls-pakchois.patch	Sat Apr  2 11:35:16 2011
@@ -0,0 +1,11 @@
+--- gnutls-2.12.0/lib/m4/hooks.m4.orig	2011-03-10 16:54:36.000000000 +0100
++++ gnutls-2.12.0/lib/m4/hooks.m4	2011-04-02 11:22:10.510496900 +0200
+@@ -111,7 +111,7 @@
+   if test "$included_pakchois" = "no"; then
+     AC_LIB_HAVE_LINKFLAGS(pakchois,, [#include <pakchois/pakchois.h>],
+                           [pakchois_module_load(0,0);])
+-    if test "$ac_cv_pakchois" != yes; then
++    if test "$ac_cv_libpakchois" != yes; then
+       included_pakchois=yes
+       AC_MSG_WARN([[
+   *** 
================================================================

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