- pakchois patch to fix system pakchois check

- more fixes in link patch to link with built libgnutls instead of installed

Changed files:
    gnutls-link.patch -> 1.4
    gnutls-pakchois.patch -> 1.1
    gnutls.spec -> 1.120

diff --git a/gnutls-link.patch b/gnutls-link.patch
index 8ebc0b836d00ca243dd9f4ee983d667621781978..2613d2d779fa959fe3333402b919eabc41da9c79 100644 (file)
--- a/gnutls-link.patch
+++ b/gnutls-link.patch
@@ -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

diff --git a/gnutls-pakchois.patch b/gnutls-pakchois.patch
new file mode 100644 (file)
index 0000000..541e1b4
--- /dev/null
+++ b/gnutls-pakchois.patch
@@ -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([[
+   *** 

diff --git a/gnutls.spec b/gnutls.spec
index 4c427ce37b22ed5eaeb34750af84c79bbfbf7516..86c8e6c00c18d006f374736e88a2c5877849df37 100644 (file)
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -10,6 +10,7 @@ Source0:      ftp://ftp.gnutls.org/pub/gnutls/%{name}-%{version}.tar.bz2
 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
@@ -142,6 +143,7 @@ Wiązania Guile do GnuTLS.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -154,6 +156,11 @@ cd lib
 %{__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 \