From 593a6c4a1be4c482d7405dfa1ed23cab2ab9cef2 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Wed, 27 Nov 2013 14:16:02 +0100
Subject: [PATCH] updated for libtasn1 3.4

---
 libtasn1-2.12-rpath.patch | 21 ---------------------
 libtasn1-3.4-rpath.patch  | 12 ++++++++++++
 libtasn1.spec             |  9 ++++++---
 sources                   |  1 +
 4 files changed, 19 insertions(+), 24 deletions(-)
 delete mode 100644 libtasn1-2.12-rpath.patch
 create mode 100644 libtasn1-3.4-rpath.patch

diff --git a/libtasn1-2.12-rpath.patch b/libtasn1-2.12-rpath.patch
deleted file mode 100644
index 109edea..0000000
--- a/libtasn1-2.12-rpath.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up libtasn1-2.12/configure.rpath libtasn1-2.12/configure
---- libtasn1-2.12/configure.rpath	2012-03-19 10:14:43.000000000 +0100
-+++ libtasn1-2.12/configure	2012-03-20 15:07:06.555041791 +0100
-@@ -11373,7 +11373,7 @@ shlibpath_var=
- shlibpath_overrides_runpath=unknown
- version_type=none
- dynamic_linker="$host_os ld.so"
--sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"
- need_lib_prefix=unknown
- hardcode_into_libs=no
- 
-@@ -11771,7 +11771,7 @@ fi
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64 $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
diff --git a/libtasn1-3.4-rpath.patch b/libtasn1-3.4-rpath.patch
new file mode 100644
index 0000000..91d44e2
--- /dev/null
+++ b/libtasn1-3.4-rpath.patch
@@ -0,0 +1,12 @@
+diff -ur libtasn1-3.4.orig/configure libtasn1-3.4/configure
+--- libtasn1-3.4.orig/configure	2013-11-25 20:24:23.000000000 +0100
++++ libtasn1-3.4/configure	2013-11-27 14:08:42.872612379 +0100
+@@ -12376,7 +12376,7 @@
+ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
++sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
diff --git a/libtasn1.spec b/libtasn1.spec
index 95f19fc..e4b6a30 100644
--- a/libtasn1.spec
+++ b/libtasn1.spec
@@ -1,7 +1,7 @@
 Summary:	The ASN.1 library used in GNUTLS
 Name:		libtasn1
-Version:	3.3
-Release:	2%{?dist}
+Version:	3.4
+Release:	1%{?dist}
 
 # The libtasn1 library is LGPLv2+, utilities are GPLv3+
 License:	GPLv3+ and LGPLv2+
@@ -9,7 +9,7 @@ Group:		System Environment/Libraries
 URL:		http://www.gnu.org/software/libtasn1/
 Source0:	http://ftp.gnu.org/gnu/libtasn1/%name-%version.tar.gz
 Source1:	http://ftp.gnu.org/gnu/libtasn1/%name-%version.tar.gz.sig
-Patch1:		libtasn1-2.12-rpath.patch
+Patch1:		libtasn1-3.4-rpath.patch
 BuildRequires:	bison, pkgconfig
 %ifarch %ix86 x86_64 ppc ppc64
 BuildRequires:	valgrind
@@ -102,6 +102,9 @@ test "$1" = 0 -a -f %_infodir/%name.info.gz && \
 
 
 %changelog
+* Wed Nov 27 2013 Nikos <nmavrogi@redhat.com> - 3.4-1
+- new upstream release
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index bcb526d..9f44d70 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 2bdd687f487c50a0382b99553866a6e0  libtasn1-3.3.tar.gz
 16f920f77aa34eec1a0558729201942d  libtasn1-3.3.tar.gz.sig
+21ec021c534b0f30b2834ce233c70f15  libtasn1-3.4.tar.gz