rpms/opensc/devel opensc-0.10.1-rpath64.patch, NONE, 1.1 opensc.spec, 1.8, 1.9

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22460

Modified Files:
	opensc.spec 
Added Files:
	opensc-0.10.1-rpath64.patch 
Log Message:
* Wed Feb 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.10.1-2
- Avoid standard rpaths on lib64 archs.


opensc-0.10.1-rpath64.patch:

--- NEW FILE opensc-0.10.1-rpath64.patch ---
--- 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


Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- opensc.spec	8 Jan 2006 22:14:15 -0000	1.8
+++ opensc.spec	15 Feb 2006 20:57:35 -0000	1.9
@@ -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 @@
 
 %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 @@
 
 
 %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.