rpms/gnutls/F-13 gnutls-2.8.6-link-libgcrypt.patch, NONE, 1.1 .cvsignore, 1.26, 1.27 gnutls.spec, 1.52, 1.53 sources, 1.26, 1.27 gnutls-2.8.5-ImplicitDSOLinking_libgcrypt.patch, 1.1, NONE

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/gnutls/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12345

Modified Files:
	.cvsignore gnutls.spec sources 
Added Files:
	gnutls-2.8.6-link-libgcrypt.patch 
Removed Files:
	gnutls-2.8.5-ImplicitDSOLinking_libgcrypt.patch 
Log Message:
* Wed May 12 2010 Tomas Mraz <tmraz at redhat.com> 2.8.6-1
- upgrade to a new upstream version


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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/F-13/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore	2 Nov 2009 21:05:33 -0000	1.26
+++ .cvsignore	12 May 2010 19:42:11 -0000	1.27
@@ -1 +1 @@
-gnutls-2.8.5-nosrp.tar.bz2
+gnutls-2.8.6-nosrp.tar.bz2


Index: gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/F-13/gnutls.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- gnutls.spec	16 Feb 2010 01:26:02 -0000	1.52
+++ gnutls.spec	12 May 2010 19:42:12 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: A TLS protocol implementation
 Name: gnutls
-Version: 2.8.5
-Release: 4%{?dist}
+Version: 2.8.6
+Release: 1%{?dist}
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
 License: GPLv3+ and LGPLv2+
 Group: System Environment/Libraries
@@ -16,8 +16,7 @@ URL: http://www.gnutls.org/
 Source0: %{name}-%{version}-nosrp.tar.bz2
 Source1: libgnutls-config
 Patch1: gnutls-2.8.5-rpath.patch
-# upstreamable patch fixing implicit linking against libgcrypt
-Patch2: gnutls-2.8.5-ImplicitDSOLinking_libgcrypt.patch
+Patch2: gnutls-2.8.6-link-libgcrypt.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libgcrypt >= 1.2.2
@@ -71,7 +70,7 @@ This package contains Guile bindings for
 %prep
 %setup -q
 %patch1 -p1 -b .rpath
-%patch2 -p1 -b .ImplicitDSOLinking_libgcrypt
+%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
@@ -155,6 +154,9 @@ fi
 %{_datadir}/guile/site/gnutls.scm
 
 %changelog
+* Wed May 12 2010 Tomas Mraz <tmraz at redhat.com> 2.8.6-1
+- upgrade to a new upstream version
+
 * Mon Feb 15 2010 Rex Dieter <rdieter at fedoraproject.org> 2.8.5-4
 - FTBFS gnutls-2.8.5-3.fc13: ImplicitDSOLinking (#564624)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnutls/F-13/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	2 Nov 2009 21:05:33 -0000	1.26
+++ sources	12 May 2010 19:42:12 -0000	1.27
@@ -1 +1 @@
-21b5caa451af00f9a9dd680a0430c00b  gnutls-2.8.5-nosrp.tar.bz2
+23f98683d03f6aa332216c55fe288956  gnutls-2.8.6-nosrp.tar.bz2


--- gnutls-2.8.5-ImplicitDSOLinking_libgcrypt.patch DELETED ---