From 330eeb71e87f7e39d324b2a24c593b46f2233f56 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <scop@fedoraproject.org>
Date: Feb 15 2006 20:57:35 +0000
Subject: - Avoid standard rpaths on lib64 archs.


---

diff --git a/opensc-0.10.1-rpath64.patch b/opensc-0.10.1-rpath64.patch
new file mode 100644
index 0000000..1a0a9e4
--- /dev/null
+++ b/opensc-0.10.1-rpath64.patch
@@ -0,0 +1,22 @@
+--- opensc-0.10.1/configure~	2006-01-08 23:03:28.000000000 +0200
++++ opensc-0.10.1/configure	2006-02-15 22:52:09.000000000 +0200
+@@ -9016,7 +9016,7 @@
+   # 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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+--- opensc-0.10.1/aclocal.m4~	2006-01-08 23:03:24.000000000 +0200
++++ opensc-0.10.1/aclocal.m4	2006-02-15 22:50:47.000000000 +0200
+@@ -1581,7 +1581,7 @@
+   # 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)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
diff --git a/opensc.spec b/opensc.spec
index 5419557..38514dd 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -2,13 +2,14 @@
 
 Name:           opensc
 Version:        0.10.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.opensc.org/
 Source0:        http://www.opensc.org/files/opensc/%{name}-%{version}.tar.gz
+Patch0:         %{name}-0.10.1-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.1.1
@@ -50,6 +51,8 @@ OpenSC development files.
 
 %prep
 %setup -q
+# patch0: --disable-rpath doesn't seem to do what it implies
+%patch0 -p1
 cp -p src/pkcs15init/README ./README.pkcs15init
 cp -p src/scconf/README.scconf .
 
@@ -135,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.10.1-2
+- Avoid standard rpaths on lib64 archs.
+
 * Sun Jan  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.10.1-1
 - 0.10.1.