From 6b3971c6a94eaabade8013aed9e85de26c0577b9 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 4 Aug 2010 17:48:18 +0300 Subject: [PATCH] Update to 1.4.0 --- .gitignore | 2 +- ccid.spec | 20 +++++++++++--------- sources | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 0643d8c..ab19b71 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -ccid-1.3.13.tar.bz2 +ccid-1.4.0.tar.bz2 diff --git a/ccid.spec b/ccid.spec index 83ddb3c..5392c24 100644 --- a/ccid.spec +++ b/ccid.spec @@ -1,10 +1,9 @@ %define dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null) -%define libusb_ver 0.1.7 -%define pcsc_lite_ver 1.6.0 -%define upstream_build 3300 +%define pcsc_lite_ver 1.6.2 +%define upstream_build 3333 Name: ccid -Version: 1.3.13 +Version: 1.4.0 Release: 1%{dist} Summary: Generic USB CCID smart card reader driver @@ -14,11 +13,10 @@ URL: http://pcsclite.alioth.debian.org/ccid.html Source0: http://alioth.debian.org/download.php/%{upstream_build}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libusb-devel >= %{libusb_ver} +BuildRequires: libusb1-devel BuildRequires: pcsc-lite-devel >= %{pcsc_lite_ver} Requires(post): initscripts Requires(postun): initscripts -Requires: libusb >= %{libusb_ver} Requires: pcsc-lite >= %{pcsc_lite_ver} Provides: pcsc-ifd-handler # 390 does not have libusb or smartCards @@ -41,8 +39,6 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -#make install_ccidtwin -C src DESTDIR=$RPM_BUILD_ROOT -mv $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf ./GemPCTwin.reader.conf mv $RPM_BUILD_ROOT/usr/share/doc/ccid/README_Kobil_mIDentity_switch.txt ./ %{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d %{__install} -m 644 src/pcscd_ccid.rules $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/85-pcscd_ccid.rules @@ -63,9 +59,10 @@ exit 0 %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README GemPCTwin.reader.conf README_Kobil_mIDentity_switch.txt +%doc AUTHORS ChangeLog COPYING README README_Kobil_mIDentity_switch.txt %{dropdir}/ifd-ccid.bundle/ %{dropdir}/serial/ +%config %{_sysconfdir}/reader.conf.d/libccidtwin %config %{_sysconfdir}/udev/rules.d/85-pcscd_ccid.rules %{_bindir}/RSA_SecurID_getpasswd %{_mandir}/man1/RSA_SecurID_getpasswd.1.gz @@ -75,6 +72,11 @@ exit 0 %changelog +* Wed Aug 04 2010 Kalev Lember - 1.4.0-1 +- Update to 1.4.0 +- Build against libusb1 instead of libusb 0.1 +- Install libccidtwin configuration file + * Sun Jul 04 2010 Kalev Lember - 1.3.13-1 - Update to 1.3.13 diff --git a/sources b/sources index 2e63810..cb04b11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -275360cb253299b763e1122adf847265 ccid-1.3.13.tar.bz2 +745d681bed2e17579fa6144e19bcb01d ccid-1.4.0.tar.bz2