diff --git a/.gitignore b/.gitignore index a56c520..2bdb489 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /pcsc-lite-1.7.0.tar.bz2 /pcsc-lite-1.7.1.tar.bz2 /pcsc-lite-1.7.2.tar.bz2 +/pcsc-lite-1.7.3.tar.bz2 diff --git a/pcsc-lite-1.5.5-rpath64.patch b/pcsc-lite-1.5.5-rpath64.patch deleted file mode 100644 index ae93ce2..0000000 --- a/pcsc-lite-1.5.5-rpath64.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pcsc-lite-1.5.5/configure.rpath64 2009-11-18 14:03:19.000000000 +0200 -+++ pcsc-lite-1.5.5/configure 2009-11-18 14:06:08.000000000 +0200 -@@ -11135,7 +11135,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" - need_lib_prefix=unknown - hardcode_into_libs=no - -@@ -11552,7 +11552,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/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.6.6-no_auto_power_down b/pcsc-lite-1.6.6-no_auto_power_down deleted file mode 100644 index 324642c..0000000 --- a/pcsc-lite-1.6.6-no_auto_power_down +++ /dev/null @@ -1,24 +0,0 @@ -diff -up pcsc-lite-1.6.6/src/pcscd.h.in.no_auto_power_down pcsc-lite-1.6.6/src/pcscd.h.in ---- pcsc-lite-1.6.6/src/pcscd.h.in.no_auto_power_down 2010-12-13 16:29:40.328693266 +0200 -+++ pcsc-lite-1.6.6/src/pcscd.h.in 2010-12-13 16:30:04.531954586 +0200 -@@ -63,7 +63,7 @@ enum - #define PCSCLITE_STATUS_EVENT_TIMEOUT 10*60*1000 /* 10 minutes */ - - /* Uncomment the next line if you do NOT want to use auto power off */ --/* #define DISABLE_ON_DEMAND_POWER_ON */ -+#define DISABLE_ON_DEMAND_POWER_ON - - /* Uncomment the next line if you do not want the card to be powered on - * when inserted */ -diff -up pcsc-lite-1.6.6/src/pcscd.h.no_auto_power_down pcsc-lite-1.6.6/src/pcscd.h ---- pcsc-lite-1.6.6/src/pcscd.h.no_auto_power_down 2010-12-13 16:29:31.064593222 +0200 -+++ pcsc-lite-1.6.6/src/pcscd.h 2010-12-13 16:29:55.337855295 +0200 -@@ -63,7 +63,7 @@ enum - #define PCSCLITE_STATUS_EVENT_TIMEOUT 10*60*1000 /* 10 minutes */ - - /* Uncomment the next line if you do NOT want to use auto power off */ --/* #define DISABLE_ON_DEMAND_POWER_ON */ -+#define DISABLE_ON_DEMAND_POWER_ON - - /* Uncomment the next line if you do not want the card to be powered on - * when inserted */ diff --git a/pcsc-lite-1.7.2-loglevel.patch b/pcsc-lite-1.7.2-loglevel.patch deleted file mode 100644 index 7682e47..0000000 --- a/pcsc-lite-1.7.2-loglevel.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up pcsc-lite-1.7.2/src/winscard.c.loglevel pcsc-lite-1.7.2/src/winscard.c ---- pcsc-lite-1.7.2/src/winscard.c.loglevel 2011-02-02 15:43:35.000000000 +0200 -+++ pcsc-lite-1.7.2/src/winscard.c 2011-05-25 06:41:21.012756755 +0300 -@@ -287,7 +287,7 @@ LONG SCardConnect(/*@unused@*/ SCARDCONT - { - if (!(readerState & SCARD_PRESENT)) - { -- Log1(PCSC_LOG_ERROR, "Card Not Inserted"); -+ Log1(PCSC_LOG_DEBUG, "Card Not Inserted"); - return SCARD_E_NO_SMARTCARD; - } - -diff -up pcsc-lite-1.7.2/src/winscard_svc.c.loglevel pcsc-lite-1.7.2/src/winscard_svc.c ---- pcsc-lite-1.7.2/src/winscard_svc.c.loglevel 2011-01-29 15:50:59.000000000 +0200 -+++ pcsc-lite-1.7.2/src/winscard_svc.c 2011-05-25 06:41:21.011756744 +0300 -@@ -285,7 +285,7 @@ static const char *CommandsText[] = { - #define WRITE_BODY(v) \ - WRITE_BODY_WITH_COMMAND(CommandsText[header.command], v) - #define WRITE_BODY_WITH_COMMAND(command, v) \ -- Log4(SCARD_S_SUCCESS == v.rv ? PCSC_LOG_DEBUG : PCSC_LOG_ERROR, "%s rv=0x%X for client %d", command, v.rv, filedes); \ -+ Log4(PCSC_LOG_DEBUG, "%s rv=0x%X for client %d", command, v.rv, filedes); \ - ret = MessageSend(&v, sizeof(v), filedes); - - static void ContextThread(LPVOID newContext) diff --git a/pcsc-lite.spec b/pcsc-lite.spec index f181c3d..63595d6 100644 --- a/pcsc-lite.spec +++ b/pcsc-lite.spec @@ -1,8 +1,8 @@ -%global upstream_build 3533 +%global upstream_build 3591 Name: pcsc-lite -Version: 1.7.2 -Release: 2%{?dist} +Version: 1.7.3 +Release: 1%{?dist} Summary: PC/SC Lite smart card framework and applications Group: System Environment/Daemons @@ -11,14 +11,8 @@ URL: http://pcsclite.alioth.debian.org/ Source0: http://alioth.debian.org/download.php/%{upstream_build}/%{name}-%{version}.tar.bz2 Source1: pcscd.init Patch0: %{name}-1.4-docinst.patch -Patch1: %{name}-1.5.5-rpath64.patch # Disable pcscd on-demand startup (#653903) Patch2: %{name}-1.6.7-noautostart.patch -# Disable automatic card power down which seems to be unreliable at this point -Patch3: %{name}-1.6.6-no_auto_power_down -# Avoid filling log files with "rv=0x... for client" and "Card Not Inserted" -# messages (#657658, #707412) -Patch4: pcsc-lite-1.7.2-loglevel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libudev-devel @@ -69,9 +63,7 @@ Requires: %{name}-libs = %{version}-%{release} %prep %setup -q %patch0 -p0 -b .docinst -%patch1 -p1 -b .rpath64 %patch2 -p1 -b .noautostart -%patch4 -p1 -b .loglevel # Convert to utf-8 for file in ChangeLog; do @@ -154,6 +146,11 @@ fi %changelog +* Wed Jun 22 2011 Kalev Lember - 1.7.3-1 +- Update to 1.7.3 +- Dropped upstreamed patches +- Dropped the lib64 rpath patch; pcsc-lite now uses system libtool + * Wed May 25 2011 Kalev Lember - 1.7.2-2 - Don't fill log files with repeating messages (#657658, #707412) diff --git a/sources b/sources index d368fae..25a36ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -47e7055cfc14399fdaa1b7a4aa06e5aa pcsc-lite-1.7.2.tar.bz2 +0dfc1639e4020fb3c04ab37425abbb12 pcsc-lite-1.7.3.tar.bz2