rpms/gnutls/devel gnutls-2.8.6-link-libgcrypt.patch, NONE, 1.1 gnutls.spec, 1.53, 1.54

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/gnutls/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32062

Modified Files:
	gnutls.spec 
Added Files:
	gnutls-2.8.6-link-libgcrypt.patch 
Log Message:
Examples need to link with libgcrypt too.


gnutls-2.8.6-link-libgcrypt.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnutls-2.8.6-link-libgcrypt.patch ---
diff -up gnutls-2.8.6/doc/examples/Makefile.am.link gnutls-2.8.6/doc/examples/Makefile.am
--- gnutls-2.8.6/doc/examples/Makefile.am.link	2010-01-24 11:06:21.000000000 +0100
+++ gnutls-2.8.6/doc/examples/Makefile.am	2010-05-12 21:22:51.000000000 +0200
@@ -30,7 +30,7 @@ LDADD = libexamples.la				\
 	../../lib/libgnutls.la			\
 	../../libextra/libgnutls-extra.la	\
 	../../gl/libgnu.la			\
-	$(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB)
+	$(LTLIBGCRYPT) $(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB)
 
 CXX_LDADD = $(LDADD) \
 	../../lib/libgnutlsxx.la
diff -up gnutls-2.8.6/doc/examples/Makefile.in.link gnutls-2.8.6/doc/examples/Makefile.in
--- gnutls-2.8.6/doc/examples/Makefile.in.link	2010-03-15 11:29:19.000000000 +0100
+++ gnutls-2.8.6/doc/examples/Makefile.in	2010-05-12 21:23:25.000000000 +0200
@@ -827,7 +827,7 @@ LDADD = libexamples.la				\
 	../../lib/libgnutls.la			\
 	../../libextra/libgnutls-extra.la	\
 	../../gl/libgnu.la			\
-	$(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB)
+	$(LTLIBGCRYPT) $(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB)
 
 CXX_LDADD = $(LDADD) \
 	../../lib/libgnutlsxx.la


Index: gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/devel/gnutls.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- gnutls.spec	12 May 2010 18:00:18 -0000	1.53
+++ gnutls.spec	12 May 2010 19:25:56 -0000	1.54
@@ -16,6 +16,7 @@ URL: http://www.gnutls.org/
 Source0: %{name}-%{version}-nosrp.tar.bz2
 Source1: libgnutls-config
 Patch1: gnutls-2.8.5-rpath.patch
+Patch2: gnutls-2.8.6-link-libgcrypt.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libgcrypt >= 1.2.2
@@ -69,6 +70,7 @@ This package contains Guile bindings for
 %prep
 %setup -q
 %patch1 -p1 -b .rpath
+%patch2 -p1 -b .link
 
 for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do
     touch lib/$i