From 82221f2ab4830b5752638555e788e024303ac27b Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Thu, 18 Jun 2015 15:54:56 +0200
Subject: [PATCH] rename the symbol version for internal symbols to avoid
 clashes with 3.3.x

Resolves: rhbz#1232447, rhbz#1230889, rhbz#1233191
---
 gnutls-3.4.2-internals.patch | 13 +++++++++++++
 gnutls.spec                  |  9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 gnutls-3.4.2-internals.patch

diff --git a/gnutls-3.4.2-internals.patch b/gnutls-3.4.2-internals.patch
new file mode 100644
index 0000000..7bfb957
--- /dev/null
+++ b/gnutls-3.4.2-internals.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/libgnutls.map b/lib/libgnutls.map
+index 3dc7ea1..787b16a 100644
+--- a/lib/libgnutls.map
++++ b/lib/libgnutls.map
+@@ -1076,7 +1076,7 @@ GNUTLS_FIPS140_3_4 {
+ 	_gnutls_ecdh_compute_key;
+ };
+ 
+-GNUTLS_PRIVATE {
++GNUTLS_PRIVATE_3_4 {
+   global:
+ 	# Internal symbols needed by libgnutls-openssl:
+ 	_gnutls_pkix1_asn;
diff --git a/gnutls.spec b/gnutls.spec
index 5cf0b29..344d971 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -3,7 +3,7 @@
 Summary: A TLS protocol implementation
 Name: gnutls
 Version: 3.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 # The libraries are LGPLv2.1+, utilities are GPLv3+
 License: GPLv3+ and LGPLv2+
 Group: System Environment/Libraries
@@ -35,6 +35,7 @@ Source2: hobble-gnutls
 Patch1: gnutls-3.2.7-rpath.patch
 Patch3: gnutls-3.1.11-nosrp.patch
 Patch4: gnutls-3.4.1-default-policy.patch
+Patch5: gnutls-3.4.2-internals.patch
 
 # Wildcard bundling exception https://fedorahosted.org/fpc/ticket/174
 Provides: bundled(gnulib) = 20130424
@@ -137,6 +138,8 @@ This package contains Guile bindings for the library.
 %patch1 -p1 -b .rpath
 %patch3 -p1 -b .nosrp
 %patch4 -p1 -b .default-policy
+%patch5 -p1 -b .internals
+
 sed 's/gnutls_srp.c//g' -i lib/Makefile.in
 sed 's/gnutls_srp.lo//g' -i lib/Makefile.in
 rm -f lib/minitasn1/*.c lib/minitasn1/*.h
@@ -272,6 +275,10 @@ fi
 %endif
 
 %changelog
+* Wed Jun 18 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.4.2-2
+- rename the symbol version for internal symbols to avoid clashes
+  with 3.3.x.
+
 * Wed Jun 17 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> 3.4.2-1
 - new upstream release