diff --git a/.cvsignore b/.cvsignore index 4cf4eb0..5474698 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pcsc-lite-1.4.4.tar.gz +pcsc-lite-1.4.102.tar.bz2 diff --git a/import.log b/import.log new file mode 100644 index 0000000..e055ee0 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +pcsc-lite-1_4_102-1_rhel5_bob:HEAD:pcsc-lite-1.4.102-1.rhel5_bob.src.rpm:1219883684 diff --git a/pcsc-lite-1.3.0-rpath64.patch b/pcsc-lite-1.3.0-rpath64.patch deleted file mode 100644 index 71b3d6a..0000000 --- a/pcsc-lite-1.3.0-rpath64.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pcsc-lite-1.3.0/configure~ 2006-03-03 15:48:59.000000000 +0200 -+++ pcsc-lite-1.3.0/configure 2006-03-05 23:40:48.000000000 +0200 -@@ -9103,7 +9103,7 @@ - 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="/lib64 /usr/lib64 /lib /usr/lib" - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then -@@ -9480,7 +9480,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/pcsc-lite-1.4.100-rpath64.patch b/pcsc-lite-1.4.100-rpath64.patch new file mode 100644 index 0000000..d833c31 --- /dev/null +++ b/pcsc-lite-1.4.100-rpath64.patch @@ -0,0 +1,20 @@ +--- pcsc-lite-1.4.101/configure.rpath64 2008-04-30 08:14:32.000000000 -0700 ++++ pcsc-lite-1.4.101/configure 2008-05-06 17:13:11.168871000 -0700 +@@ -10503,7 +10503,7 @@ + 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="/lib64 /usr/lib64 /lib /usr/lib" + + if test "$GCC" = yes; then + case $host_os in +@@ -10902,7 +10902,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>/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="/lib64 /usr/lib/64 /lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on diff --git a/pcsc-lite-1.4.4-quiet.patch b/pcsc-lite-1.4.4-quiet.patch deleted file mode 100644 index 69069c5..0000000 --- a/pcsc-lite-1.4.4-quiet.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ./src/winscard_clnt.c.quiet 2008-01-16 12:35:22.351449000 -0800 -+++ ./src/winscard_clnt.c 2008-01-16 12:35:38.034369000 -0800 -@@ -3415,7 +3415,7 @@ - - if (rv != 0) - { -- Log1(PCSC_LOG_ERROR, "PCSC Not Running"); -+ Log1(PCSC_LOG_INFO, "PCSC Not Running"); - return SCARD_E_NO_SERVICE; - } - -@@ -3434,7 +3434,7 @@ - { - int i; - -- Log1(PCSC_LOG_ERROR, "PCSC restarted"); -+ Log1(PCSC_LOG_INFO, "PCSC restarted"); - - /* invalid all handles */ - SCardLockThread(); diff --git a/pcsc-lite-1.4.4-service.patch b/pcsc-lite-1.4.4-service.patch deleted file mode 100644 index 7538a08..0000000 --- a/pcsc-lite-1.4.4-service.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./etc/pcscd.init.in.service 2008-01-16 12:50:03.040049000 -0800 -+++ ./etc/pcscd.init.in 2008-01-16 12:50:29.460919000 -0800 -@@ -37,7 +37,7 @@ - PCSCD_OPTIONS= - - # Source config --if [ -f @sysconfdir_exp@/sysconfig/pscsd ] ; then -+if [ -f @sysconfdir_exp@/sysconfig/pcscd ] ; then - . @sysconfdir_exp@/sysconfig/pcscd - fi - diff --git a/pcsc-lite.spec b/pcsc-lite.spec index 2187206..5b0e8b6 100644 --- a/pcsc-lite.spec +++ b/pcsc-lite.spec @@ -1,17 +1,14 @@ Name: pcsc-lite -Version: 1.4.4 -Release: 3%{dist} +Version: 1.4.102 +Release: 1%{?dist} Summary: PC/SC Lite smart card framework and applications Group: System Environment/Daemons License: BSD URL: http://pcsclite.alioth.debian.org/ -Source0: http://alioth.debian.org/download.php/2106/%{name}-%{version}.tar.gz +Source0: http://alioth.debian.org/download.php/2106/%{name}-%{version}.tar.bz2 Patch0: %{name}-1.4-docinst.patch -Patch1: %{name}-1.3.0-rpath64.patch -# upstream rev 2731 -Patch2: %{name}-1.4.4-quiet.patch -Patch3: %{name}-1.4.4-service.patch +Patch1: %{name}-1.4.100-rpath64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,8 +62,6 @@ Group: Documentation %setup -q %patch0 -p0 -b .docinst %patch1 -p1 -b .rpath64 -%patch2 -p0 -b .quiet -%patch3 -p0 -b .service %build %configure \ @@ -153,6 +148,12 @@ fi %changelog +* Wed Aug 17 2008 Bob Relyea - 1.4.102-1 +- Pick up 1.4.102 + +* Wed May 6 2008 Bob Relyea - 1.4.101-1 +- Pick up 1.4.101 + * Tue Feb 19 2008 Fedora Release Engineering - 1.4.4-3 - Autorebuild for GCC 4.3 diff --git a/sources b/sources index a8c6acf..882073b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6710141d878c12d3b701dc88b9c688c0 pcsc-lite-1.4.4.tar.gz +b97d3a725ab93662adf09acfbc49efeb pcsc-lite-1.4.102.tar.bz2