From a9343f9af3fa652b0cd472e6cd28a804d9aa6b5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= <tmraz@fedoraproject.org>
Date: Thu, 28 Jan 2010 12:58:40 +0000
Subject: [PATCH] - drop superfluous rpath

---
 libtasn1-2.4-rpath.patch | 21 +++++++++++++++++++++
 libtasn1.spec            |  8 +++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 libtasn1-2.4-rpath.patch

diff --git a/libtasn1-2.4-rpath.patch b/libtasn1-2.4-rpath.patch
new file mode 100644
index 0000000..f760844
--- /dev/null
+++ b/libtasn1-2.4-rpath.patch
@@ -0,0 +1,21 @@
+diff -up libtasn1-2.4/configure.rpath libtasn1-2.4/configure
+--- libtasn1-2.4/configure.rpath	2010-01-18 08:58:04.000000000 +0100
++++ libtasn1-2.4/configure	2010-01-28 13:54:09.000000000 +0100
+@@ -10509,7 +10509,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
+ 
+@@ -10894,7 +10894,7 @@ rm -f core conftest.err conftest.$ac_obj
+   # 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;/^$/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.spec b/libtasn1.spec
index 50a8f83..0fc5145 100644
--- a/libtasn1.spec
+++ b/libtasn1.spec
@@ -3,7 +3,7 @@
 Summary:	The ASN.1 library used in GNUTLS
 Name:		libtasn1
 Version:	2.4
-Release:	%release_func 1
+Release:	%release_func 2
 
 # The libtasn1 library is LGPLv2+, utilities are GPLv3+
 License:	GPLv3+ and LGPLv2+
@@ -11,6 +11,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.4-rpath.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	bison, pkgconfig
 %ifarch %ix86 x86_64 ppc ppc64
@@ -56,6 +57,8 @@ This package contains tools using the libtasn library.
 %prep
 %setup -q
 
+%patch1 -p1 -b .rpath
+
 %build
 %configure --disable-static
 
@@ -111,6 +114,9 @@ test "$1" = 0 -a -f %_infodir/%name.info.gz && \
 
 
 %changelog
+* Thu Jan 28 2010 Tomas Mraz <tmraz@redhat.com> - 2.4-2
+- drop superfluous rpath
+
 * Mon Jan 18 2010 Tomas Mraz <tmraz@redhat.com> - 2.4-1
 - new upstream release