- added link patch to avoid forcing -L%{_libdir}; dumb BC dropped now

- release 2

Changed files:
    gnutls-link.patch -> 1.3
    gnutls.spec -> 1.109

diff --git a/gnutls-link.patch b/gnutls-link.patch
new file mode 100644 (file)
index 0000000..8ebc0b8
--- /dev/null
+++ b/gnutls-link.patch
@@ -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

diff --git a/gnutls.spec b/gnutls.spec
index 0f4a928e587ecc6a51d3830ca9490f7b9e7f58dc..fa2ad0396bc2d181c58efeeae97c7339a08262b3 100644 (file)
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -2,12 +2,13 @@ Summary:      The GNU Transport Layer Security Library
 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
@@ -27,7 +28,6 @@ BuildRequires:        readline-devel
 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
@@ -135,6 +135,7 @@ Wiązania Guile do GnuTLS.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}