rpms/openct/devel openct-0.6.6-rpath64.patch, NONE, 1.1 openct.spec, 1.7, 1.8

[Ville Skytta (scop)]

Author: scop

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

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


openct-0.6.6-rpath64.patch:

--- NEW FILE openct-0.6.6-rpath64.patch ---
--- openct-0.6.6/configure~	2005-09-11 13:05:19.000000000 +0300
+++ openct-0.6.6/configure	2006-02-15 09:28:00.000000000 +0200
@@ -9293,7 +9293,7 @@
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | 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
--- openct-0.6.6/acinclude.m4~	2005-09-11 13:04:40.000000000 +0300
+++ openct-0.6.6/acinclude.m4	2006-02-15 09:27:20.000000000 +0200
@@ -2983,7 +2983,7 @@
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | 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: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openct.spec	28 Nov 2005 19:25:29 -0000	1.7
+++ openct.spec	15 Feb 2006 07:31:39 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           openct
 Version:        0.6.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
@@ -11,6 +11,7 @@
 Source2:        %{name}.sysconfig
 Source3:        %{name}-reader.conf
 Source4:        %{name}.rules
+Patch0:         %{name}-0.6.6-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel
@@ -54,6 +55,8 @@
 
 %prep
 %setup -q
+# patch0: --disable-rpath doesn't appear to do its job
+%patch0 -p1
 sed 's|__LIBDIR__|%{_libdir}|' < %{SOURCE3} > %{name}-reader.conf
 
 
@@ -149,6 +152,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6.6-4
+- Avoid standard rpaths on lib64 archs.
+
 * Mon Nov 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.6.6-3
 - Adapt to udev, drop old hotplug support.
 - Init script improvements: incoming events don't start explicitly stopped