Remove the automatic card power down disabling patch again (#737988)
According to the bug report, pcsc-lite now works fine with latest libusb1 1.0.9 rc1 and the patch can be removed. https://bugzilla.redhat.com/show_bug.cgi?id=737988
This commit is contained in:
parent
2c48e8d706
commit
96a526ad7d
@ -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 */
|
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: pcsc-lite
|
Name: pcsc-lite
|
||||||
Version: 1.7.4
|
Version: 1.7.4
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
Summary: PC/SC Lite smart card framework and applications
|
Summary: PC/SC Lite smart card framework and applications
|
||||||
|
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
@ -14,9 +14,6 @@ Source0: http://alioth.debian.org/download.php/%{upstream_build}/%{name}-
|
|||||||
Patch0: 0001-Support-systemd-socket-activation.patch
|
Patch0: 0001-Support-systemd-socket-activation.patch
|
||||||
Patch1: 0002-Add-disable-autostart-option.patch
|
Patch1: 0002-Add-disable-autostart-option.patch
|
||||||
Patch2: 0003-Install-systemd-service-files.patch
|
Patch2: 0003-Install-systemd-service-files.patch
|
||||||
# Disable automatic card power down which seems to be unreliable at this point
|
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=737988
|
|
||||||
Patch3: pcsc-lite-1.6.6-no_auto_power_down.patch
|
|
||||||
|
|
||||||
BuildRequires: automake libtool
|
BuildRequires: automake libtool
|
||||||
BuildRequires: libudev-devel
|
BuildRequires: libudev-devel
|
||||||
@ -70,7 +67,6 @@ Requires: %{name}-libs = %{version}-%{release}
|
|||||||
%patch0 -p2 -b .socket_activation
|
%patch0 -p2 -b .socket_activation
|
||||||
%patch1 -p2 -b .noautostart
|
%patch1 -p2 -b .noautostart
|
||||||
%patch2 -p2 -b .service_files
|
%patch2 -p2 -b .service_files
|
||||||
%patch3 -p1 -b .no_auto_power_down
|
|
||||||
|
|
||||||
autoreconf -f
|
autoreconf -f
|
||||||
|
|
||||||
@ -174,6 +170,10 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 10 2011 Kalev Lember <kalevlember@gmail.com> - 1.7.4-6
|
||||||
|
- Remove the automatic card power down disabling patch again;
|
||||||
|
no longer needed with latest libusb1 1.0.9 rc1 (#737988)
|
||||||
|
|
||||||
* Fri Sep 16 2011 Kalev Lember <kalevlember@gmail.com> - 1.7.4-5
|
* Fri Sep 16 2011 Kalev Lember <kalevlember@gmail.com> - 1.7.4-5
|
||||||
- Reapply the patch to disable automatic card power down (#737988)
|
- Reapply the patch to disable automatic card power down (#737988)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user