rpms/libgcrypt/devel libgcrypt-1.4.5-ImplicitDSOLinking.patch, NONE, 1.1 libgcrypt.spec, 1.44, 1.45

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/libgcrypt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10038

Modified Files:
	libgcrypt.spec 
Added Files:
	libgcrypt-1.4.5-ImplicitDSOLinking.patch 
Log Message:
* Sun Feb 14 2010 Rex Dieter <rdieter at fedoraproject.org> 1.4.5-4
- FTBFS libgcrypt-1.4.5-3.fc13: ImplicitDSOLinking (#564973)


libgcrypt-1.4.5-ImplicitDSOLinking.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE libgcrypt-1.4.5-ImplicitDSOLinking.patch ---
diff -up libgcrypt-1.4.5/tests/Makefile.am.ImplicitDSOLinking libgcrypt-1.4.5/tests/Makefile.am
--- libgcrypt-1.4.5/tests/Makefile.am.ImplicitDSOLinking	2009-04-02 04:25:34.000000000 -0500
+++ libgcrypt-1.4.5/tests/Makefile.am	2010-02-14 14:28:49.792383613 -0600
@@ -36,7 +36,7 @@ TESTS += benchmark
 AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
 AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 
-LDADD = ../src/libgcrypt.la $(DL_LIBS)
+LDADD = ../src/libgcrypt.la $(DL_LIBS) $(GPG_ERROR_LIBS)
 
 EXTRA_PROGRAMS = testapi pkbench
 noinst_PROGRAMS = $(TESTS) fipsdrv
diff -up libgcrypt-1.4.5/tests/Makefile.in.ImplicitDSOLinking libgcrypt-1.4.5/tests/Makefile.in
--- libgcrypt-1.4.5/tests/Makefile.in.ImplicitDSOLinking	2009-12-11 09:43:30.000000000 -0600
+++ libgcrypt-1.4.5/tests/Makefile.in	2010-02-14 14:29:30.232368780 -0600
@@ -334,7 +334,7 @@ top_srcdir = @top_srcdir@
 # a built header.
 AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
 AM_CFLAGS = $(GPG_ERROR_CFLAGS)
-LDADD = ../src/libgcrypt.la $(DL_LIBS)
+LDADD = ../src/libgcrypt.la $(DL_LIBS) $(GPG_ERROR_LIBS)
 EXTRA_DIST = README rsa-16k.key cavs_tests.sh cavs_driver.pl
 all: all-am
 


Index: libgcrypt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgcrypt/devel/libgcrypt.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- libgcrypt.spec	3 Feb 2010 08:23:55 -0000	1.44
+++ libgcrypt.spec	14 Feb 2010 20:32:09 -0000	1.45
@@ -1,6 +1,6 @@
 Name: libgcrypt
 Version: 1.4.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnupg.org/
 Source0: libgcrypt-%{version}-hobbled.tar.bz2
 # The original libgcrypt sources now contain potentially patented ECC
@@ -12,6 +12,8 @@ Source2: wk at g10code.com
 Source3: hobble-libgcrypt
 # make FIPS hmac compatible with fipscheck - non upstreamable
 Patch2: libgcrypt-1.4.4-use-fipscheck.patch
+# fix ImplicitDSOLinking (missing -lgpg-error linkage in tests/), upstreamable
+Patch3: libgcrypt-1.4.5-ImplicitDSOLinking.patch
 
 # Technically LGPLv2.1+, but Fedora's table doesn't draw a distinction.
 # Documentation and some utilities are GPLv2+ licensed. These files
@@ -45,6 +47,7 @@ applications using libgcrypt.
 %setup -q
 %{SOURCE3}
 %patch2 -p1 -b .use-fipscheck
+%patch3 -p1 -b .ImplicitDSOLinking
 
 mv AUTHORS AUTHORS.iso88591
 iconv -f ISO-8859-1 -t UTF-8 AUTHORS.iso88591 >AUTHORS
@@ -156,6 +159,9 @@ exit 0
 %doc COPYING
 
 %changelog
+* Sun Feb 14 2010 Rex Dieter <rdieter at fedoraproject.org> 1.4.5-4
+- FTBFS libgcrypt-1.4.5-3.fc13: ImplicitDSOLinking (#564973)
+
 * Wed Feb  3 2010 Tomas Mraz <tmraz at redhat.com> 1.4.5-3
 - drop the S390 build workaround as it is no longer needed
 - additional spec file cleanups for merge review (#226008)