rpms/pcsc-lite/devel pcsc-lite-1.2.0-rpath64.patch, NONE, 1.1 pcsc-lite.spec, 1.6, 1.7

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/pcsc-lite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1796

Modified Files:
	pcsc-lite.spec 
Added Files:
	pcsc-lite-1.2.0-rpath64.patch 
Log Message:
* Mon Feb 13 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.2.0-14
- Avoid standard rpaths on multilib archs.
- Fine tune dependencies.


pcsc-lite-1.2.0-rpath64.patch:

--- NEW FILE pcsc-lite-1.2.0-rpath64.patch ---
--- pcsc-lite-1.2.0/configure~	2003-10-28 00:46:54.000000000 +0200
+++ pcsc-lite-1.2.0/configure	2006-02-14 00:05:39.000000000 +0200
@@ -8918,7 +8918,7 @@
   hardcode_into_libs=yes
 
   # /usr/X11R6/lib and /usr/local/lib are common enough...
-  sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/X11R6/lib /usr/local/lib"
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
@@ -12514,7 +12514,7 @@
   hardcode_into_libs=yes
 
   # /usr/X11R6/lib and /usr/local/lib are common enough...
-  sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/X11R6/lib /usr/local/lib"
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
@@ -15559,7 +15559,7 @@
   hardcode_into_libs=yes
 
   # /usr/X11R6/lib and /usr/local/lib are common enough...
-  sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/X11R6/lib /usr/local/lib"
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
@@ -17890,7 +17890,7 @@
   hardcode_into_libs=yes
 
   # /usr/X11R6/lib and /usr/local/lib are common enough...
-  sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/X11R6/lib /usr/local/lib"
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
--- pcsc-lite-1.2.0/aclocal.m4~	2003-10-28 00:46:49.000000000 +0200
+++ pcsc-lite-1.2.0/aclocal.m4	2006-02-14 00:03:43.000000000 +0200
@@ -2600,7 +2600,7 @@
   hardcode_into_libs=yes
 
   # /usr/X11R6/lib and /usr/local/lib are common enough...
-  sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/X11R6/lib /usr/local/lib"
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the


Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/pcsc-lite.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pcsc-lite.spec	11 Nov 2005 16:46:07 -0000	1.6
+++ pcsc-lite.spec	13 Feb 2006 22:16:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           pcsc-lite
 Version:        1.2.0
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        PC/SC Lite smart card framework and applications
 
 Group:          System Environment/Daemons
@@ -10,12 +10,14 @@
 Source1:        %{name}-pcscd.init
 Source2:        %{name}-update-reader.conf
 Patch0:         %{name}-docinst.patch
+Patch1:         %{name}-1.2.0-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
 BuildRequires:  flex
 BuildRequires:  libusb-devel >= 0.1.6
-Requires:       chkconfig
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
 Requires:       pcsc-ifd-handler
 
 %description
@@ -51,6 +53,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 %{__perl} -pi -e 's|/etc/init\.d\b|%{_initrddir}|' doc/pcscd.8.in
 %{__perl} -pe \
   's|__LOCALSTATEDIR__|%{_localstatedir}|g ;
@@ -109,6 +112,7 @@
 [ $1 -gt 0 ] && %{_initrddir}/pcscd try-restart >/dev/null || :
 
 %post libs -p /sbin/ldconfig
+
 %postun libs -p /sbin/ldconfig
 
 
@@ -140,6 +144,10 @@
 
 
 %changelog
+* Mon Feb 13 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.2.0-14
+- Avoid standard rpaths on multilib archs.
+- Fine tune dependencies.
+
 * Fri Nov 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.2.0-13
 - Don't ship static libraries.
 - Don't mark the init script as a config file.