diff --git a/ccid-1.3.10.tar.bz2 b/ccid-1.3.10.tar.bz2
new file mode 100644
index 0000000..fcaaf21
--- /dev/null
+++ b/ccid-1.3.10.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54610f1a6cd65e8d2b5cb9f7917e509ebcdf130a565e71e06ad4e65ed0dad5ec
+size 395627
diff --git a/ccid-1.3.8.tar.bz2 b/ccid-1.3.8.tar.bz2
deleted file mode 100644
index 6aa4ef8..0000000
--- a/ccid-1.3.8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8cb892ef36321069eff7826aa732f1481715fe54bf96346fae1d25565b44c536
-size 436222
diff --git a/pcsc-ccid.changes b/pcsc-ccid.changes
index 93ee11f..46d963e 100644
--- a/pcsc-ccid.changes
+++ b/pcsc-ccid.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Tue Apr 7 15:30:02 CEST 2009 - sbrabec@suse.cz
+
+- Updated to version 1.3.10:
+ * Added a hack to support the bogus OpenGPG card.
+ * Should work: Precise Biometrics 200 MC, Precise Biometrics 250
+ MC, SafeNet IKey4000 used in different device, Atmel
+ AT98SC032CT, Neowave Weneo, MSI StarReader SMART, VMware Virtual
+ USB CCID reader, ACS ACR122U PICC Interface, HP MFP Smart Card
+ Reader, KONA USB SmartCard, SpringCard CrazyWriter, CSB6 Basic,
+ CSB6 Secure, CSB6 Ultimate, EasyFinger Standard, EasyFinger
+ Ultimate and Prox'N'Roll, Atmel AT91SO, Cherry SmartTerminal
+ ST-1200USB, Aladdin eToken PRO USB 72K Java.
+ * Differentiate between KOBIL mIDentity M and XL.
+ * Known readers: SpringCard Prox'N'Roll, CSB6 Basic, EasyFinger
+ Ultimate, CSB6 Ultimate, EasyFinger Standard, CrazyWriter, CSB6
+ Secure, Pro-Active CSB6 Ultimate is renamed SpringCard CSB6
+ Ultimate
+ * Unsupported: Broadcom 5880, jNet Technology jToken s1.
+ * Disabled support of the contcatless part of SDI010 and SCR331DI.
+ * Avoid a "Duplicate frame detected" error.
+ * Use a very long timeout for PowerUp since the card can be very
+ slow to send the full ATR (up to 30 seconds at 4 MHz)
+ * Driver will work in a multi-reader configuration.
+- Use modalias supplements instead of eID issuer locales.
+- Require pcsc-lite.
+- Removed custom hotplug support. Now integrated in pcsc-lite.
+
-------------------------------------------------------------------
Tue Jan 27 00:39:51 CET 2009 - ro@suse.de
diff --git a/pcsc-ccid.spec b/pcsc-ccid.spec
index 853ffb0..7c8e560 100644
--- a/pcsc-ccid.spec
+++ b/pcsc-ccid.spec
@@ -1,5 +1,5 @@
#
-# spec file for package pcsc-ccid (Version 1.3.8)
+# spec file for package pcsc-ccid (Version 1.3.10)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,23 +19,38 @@
Name: pcsc-ccid
+# pcsc-ccid can use libusb-1.0 interrupt transfers over libusb-0.1 API:
+%define USE_LIBUSB1 0
%define _name ccid
-BuildRequires: libusb-devel pcsc-lite-devel pkg-config
-Version: 1.3.8
-Release: 4
-Provides: locale(MozillaFirefox:de_BE;en_BE;fr_BE;nl_BE;wa_BE)
-# If you want to experiment with libusb-1.0, uncomment following three
-# lines and remove libusb-devel from BuildRequires:
-## pcsc-ccid uses libusb-1.0 features over libusb-0.1 API:
-#BuildRequires: libusb-compat-devel
-#Requires: libusb-1_0-features-in-0_1-api
+BuildRequires: pcsc-lite-devel pkg-config
+%if %USE_LIBUSB1
+BuildRequires: libusb-compat-devel
+Requires: libusb-1_0-features-in-0_1-api
+%else
+BuildRequires: libusb-devel
+%endif
+Version: 1.3.10
+Release: 1
Group: Productivity/Security
License: LGPL v2.1 or later
Url: http://pcsclite.alioth.debian.org/ccid.html
Summary: PCSC Driver for CCID Based Smart Card Readers and GemPC Twin Serial Reader
Source: %{_name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: pcsc-lite
%define ifddir %(pkg-config libpcsclite --variable=usbdropdir)
+%define LBRACE (
+%define RBRACE )
+%define QUOTE "
+%define BACKSLASH \\
+%define USBDRIVERS %(set -x ; bunzip2 <%{S:0} | tr a-z A-Z | sed -n 's/^SUBSYSTEMS=="USB", ATTRS{IDVENDOR}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, ATTRS{IDPRODUCT}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}.*$/modalias%{LBRACE}usb:v%{BACKSLASH}1p%{BACKSLASH}2d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/p' | tr '%{BACKSLASH}n' ' ')
+# We are not using Supplements here. User may want to choose between pcsc-lite and openct:
+# Generic CCID devices:
+Enhances: modalias(usb:*ic0Bisc00d*dc*dsc*dp*ic*isc*ip*)
+# Kobil mIDentity:
+Enhances: modalias(usb:v0D46p4081d*dc*dsc*dp*ic*isc*ip*)
+# Other supported devices:
+Enhances: %USBDRIVERS
%description
This package contains a generic USB CCID (Chip/Smart Card Interface
@@ -62,16 +77,13 @@ cp -a src/towitoko/README README.towitoko
./bootstrap
%endif
%configure\
- --enable-twinserial\
- --enable-udev
+ --enable-twinserial
make %{?jobs:-j%jobs}
%install
%makeinstall
mkdir $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d
mv $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/ccidtwin.conf
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
-cp src/pcscd_ccid.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
# Copied elsewhere:
rm $RPM_BUILD_ROOT%{_datadir}/doc/ccid/README_Kobil_mIDentity_switch.txt
rmdir $RPM_BUILD_ROOT%{_datadir}/doc/ccid
@@ -88,12 +100,34 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_mandir}/man?/*.*
%{_sbindir}/*
%config (noreplace) %{_sysconfdir}/reader.conf.d/*.conf
-%dir %{_sysconfdir}/udev
-%dir %{_sysconfdir}/udev/rules.d
-%{_sysconfdir}/udev/rules.d/*.rules
%{ifddir}/*
%changelog
+* Tue Apr 07 2009 sbrabec@suse.cz
+- Updated to version 1.3.10:
+ * Added a hack to support the bogus OpenGPG card.
+ * Should work: Precise Biometrics 200 MC, Precise Biometrics 250
+ MC, SafeNet IKey4000 used in different device, Atmel
+ AT98SC032CT, Neowave Weneo, MSI StarReader SMART, VMware Virtual
+ USB CCID reader, ACS ACR122U PICC Interface, HP MFP Smart Card
+ Reader, KONA USB SmartCard, SpringCard CrazyWriter, CSB6 Basic,
+ CSB6 Secure, CSB6 Ultimate, EasyFinger Standard, EasyFinger
+ Ultimate and Prox'N'Roll, Atmel AT91SO, Cherry SmartTerminal
+ ST-1200USB, Aladdin eToken PRO USB 72K Java.
+ * Differentiate between KOBIL mIDentity M and XL.
+ * Known readers: SpringCard Prox'N'Roll, CSB6 Basic, EasyFinger
+ Ultimate, CSB6 Ultimate, EasyFinger Standard, CrazyWriter, CSB6
+ Secure, Pro-Active CSB6 Ultimate is renamed SpringCard CSB6
+ Ultimate
+ * Unsupported: Broadcom 5880, jNet Technology jToken s1.
+ * Disabled support of the contcatless part of SDI010 and SCR331DI.
+ * Avoid a "Duplicate frame detected" error.
+ * Use a very long timeout for PowerUp since the card can be very
+ slow to send the full ATR (up to 30 seconds at 4 MHz)
+ * Driver will work in a multi-reader configuration.
+- Use modalias supplements instead of eID issuer locales.
+- Require pcsc-lite.
+- Removed custom hotplug support. Now integrated in pcsc-lite.
* Tue Jan 27 2009 ro@suse.de
- added udev diretories to filelist to fix build
* Tue Jan 06 2009 sbrabec@suse.cz
@@ -153,7 +187,7 @@ rm -rf $RPM_BUILD_ROOT
function has been removed from pcscd API
* use -fvisibility=hidden is available to limit the number of
exported symbols
-* Sat Apr 01 2006 sndirsch@suse.de
+* Sun Apr 02 2006 sndirsch@suse.de
- added missing locale provides (Bug #161867)
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
@@ -275,7 +309,7 @@ rm -rf $RPM_BUILD_ROOT
- fixed /etc/init.d/pcscd status-handling (bug #9069)
* Thu Jun 07 2001 ro@suse.de
- fix broken Makefile.am
-* Sun Apr 22 2001 mge@suse.de
+* Mon Apr 23 2001 mge@suse.de
- update to 0.9.1
-* Wed Apr 18 2001 mge@suse.de
+* Thu Apr 19 2001 mge@suse.de
- created package