rpms/gnutls/devel gnutls-1.0.24-version-script.patch, NONE, 1.1 gnutls.spec, 1.7, 1.8

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Apr 23 22:45:17 UTC 2005


Author: tmraz

Update of /cvs/dist/rpms/gnutls/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12532

Modified Files:
	gnutls.spec 
Added Files:
	gnutls-1.0.24-version-script.patch 
Log Message:
* Sat Apr 23 2005 Tomas Mraz <tmraz at redhat.com> 1.0.24-2
- readd the version script dropped by upstream


gnutls-1.0.24-version-script.patch:
 lib/Makefile.in      |    2 +-
 libextra/Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnutls-1.0.24-version-script.patch ---
--- gnutls-1.0.24/lib/Makefile.in.version-script	2005-01-18 19:31:12.000000000 +0100
+++ gnutls-1.0.24/lib/Makefile.in	2005-04-24 00:35:28.989170943 +0200
@@ -352,7 +352,7 @@
 # Separate so we can create the documentation
 libgnutls_la_SOURCES = $(COBJECTS) $(X509_COBJECTS) $(MINITASN1_COBJECTS)
 libgnutls_la_LDFLAGS = $(LIBTASN1_LIBS) $(LIBGCRYPT_LIBS) \
-	$(LIBGNUTLS_EXPORTS) \
+	-Wl,--version-script=$(srcdir)/libgnutls.vers \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 all: all-recursive
--- gnutls-1.0.24/libextra/Makefile.in.version-script	2005-01-18 19:31:13.000000000 +0100
+++ gnutls-1.0.24/libextra/Makefile.in	2005-04-24 00:32:49.337607859 +0200
@@ -344,7 +344,7 @@
 	gnutls_srp.c auth_srp.c auth_srp_passwd.c auth_srp_sb64.c \
 	gnutls_extra.c auth_srp_rsa.c
 
-libgnutls_extra_la_LDFLAGS = $(LIBGNUTLS_EXTRA_EXPORTS) \
+libgnutls_extra_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libgnutls-extra.vers \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	$(LIBOPENCDK_LIBS) $(LZO_LIBS)
 


Index: gnutls.spec
===================================================================
RCS file: /cvs/dist/rpms/gnutls/devel/gnutls.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnutls.spec	22 Apr 2005 13:12:08 -0000	1.7
+++ gnutls.spec	23 Apr 2005 22:45:15 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A TLS implementation.
 Name: gnutls
 Version: 1.0.24
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 BuildPrereq: libgcrypt-devel
@@ -13,6 +13,7 @@
 # XXX patent tainted SRP code removed.
 Source0: %{name}-%{version}-nosrp.tar.bz2
 Patch0: gnutls-1.0.20-nosrp.patch
+Patch1: gnutls-1.0.24-version-script.patch
 BuildRoot: %{_tmppath}/%{name}-root
 
 %package devel
@@ -34,6 +35,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .nosrp
+%patch1 -p1 -b .version-script
 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 libextra/$i
 done
@@ -72,6 +74,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sat Apr 23 2005 Tomas Mraz <tmraz at redhat.com> 1.0.24-2
+- readd the version script dropped by upstream
+
 * Fri Apr 22 2005 Tomas Mraz <tmraz at redhat.com> 1.0.24-1
 - update to the latest upstream version on the 1.0 branch
 




More information about the fedora-cvs-commits mailing list