From ad659b1f922d85fa7a514190ba3429b325505b25 Mon Sep 17 00:00:00 2001 From: Robert Relyea Date: Mon, 26 Jun 2006 22:51:14 +0000 Subject: [PATCH 01/26] Setup of module ccid --- .cvsignore | 0 Makefile | 6 ++++++ sources | 0 3 files changed, 6 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..4520840 --- /dev/null +++ b/Makefile @@ -0,0 +1,6 @@ +# Makefile for source rpm: ccid +# $Id$ +NAME := ccid +SPECFILE = $(firstword $(wildcard *.spec)) + +include ../common/Makefile.common diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 5bd7cc054088ef46f806ae1e476fbea925720577 Mon Sep 17 00:00:00 2001 From: Robert Relyea Date: Mon, 26 Jun 2006 22:51:41 +0000 Subject: [PATCH 02/26] auto-import ccid-1.0.1-2 on branch devel from ccid-1.0.1-2.src.rpm --- .cvsignore | 1 + ccid.spec | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 116 insertions(+) create mode 100644 ccid.spec diff --git a/.cvsignore b/.cvsignore index e69de29..c831572 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +ccid-1.0.1.tar.gz diff --git a/ccid.spec b/ccid.spec new file mode 100644 index 0000000..3522ec8 --- /dev/null +++ b/ccid.spec @@ -0,0 +1,114 @@ +%define dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null) + +Name: ccid +Version: 1.0.1 +Release: 2 +Summary: Generic USB CCID smart card reader driver + +Group: System Environment/Libraries +License: LGPL +URL: http://pcsclite.alioth.debian.org/ccid.html +Source0: http://alioth.debian.org/download.php/1563/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: libusb-devel >= 0.1.7 +BuildRequires: pcsc-lite-devel >= 1.3.0 +Requires: libusb >= 0.1.7 +Requires: pcsc-lite >= 1.3.0 +Provides: pcsc-ifd-handler + +%description +Generic USB CCID (Chip/Smart Card Interface Devices) driver. + + +%prep +%setup -q +for f in ChangeLog README ; do + iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f +done + + +%build +%configure --disable-dependency-tracking --disable-static +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 + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post +if [ $1 -eq 1 -a -x %{_initrddir}/pcscd ] ; then + %{_initrddir}/pcscd try-restart >/dev/null || : +fi + +%postun +[ -x %{_initrddir}/pcscd ] && %{_initrddir}/pcscd try-restart >/dev/null || : + + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING README GemPCTwin.reader.conf +%{dropdir}/ifd-ccid.bundle/ +%{dropdir}/serial/ + + +%changelog +* Mon Jun 5 2006 Bob Relyea - 1.0.1-2 +- Move to Fedora Core, removed %%{_dist}. + +* Sat Apr 22 2006 Ville Skyttä - 1.0.1-1 +- 1.0.1. + +* Mon Mar 6 2006 Ville Skyttä - 1.0.0-1 +- 1.0.0, license changed to LGPL. + +* Wed Feb 15 2006 Ville Skyttä - 0.4.1-7 +- Rebuild. + +* Thu Nov 3 2005 Ville Skyttä - 0.4.1-6 +- Clean up build dependencies. +- Convert docs to UTF-8. + +* Fri Apr 7 2005 Michael Schwendt - 0.4.1-5 +- rebuilt + +* Fri Feb 25 2005 Ville Skyttä - 0.4.1-4 +- Drop Epoch: 0. +- Improve summary. +- Build with dependency tracking disabled. + +* Thu Jul 1 2004 Ville Skyttä - 0:0.4.1-0.fdr.3 +- Restart pcscd in post(un)install phase if it's available and running. + +* Thu May 13 2004 Ville Skyttä - 0:0.4.1-0.fdr.2 +- Provide pcsc-ifd-handler (idea from Debian). + +* Sat Feb 14 2004 Ville Skyttä - 0:0.4.1-0.fdr.1 +- Update to 0.4.1. + +* Fri Feb 13 2004 Ville Skyttä - 0:0.4.0-0.fdr.1 +- Update to 0.4.0. + +* Wed Nov 5 2003 Ville Skyttä - 0:0.3.2-0.fdr.1 +- Update to 0.3.2. +- Update URL. + +* Thu Oct 16 2003 Ville Skyttä - 0:0.3.1-0.fdr.1 +- Update to 0.3.1. + +* Wed Sep 10 2003 Ville Skyttä - 0:0.3.0-0.fdr.1 +- Update to 0.3.0. + +* Wed Aug 27 2003 Ville Skyttä - 0:0.2.0-0.fdr.1 +- Update to 0.2.0. + +* Tue Aug 19 2003 Ville Skyttä - 0:0.1.0-0.fdr.1 +- First build. diff --git a/sources b/sources index e69de29..0d340a9 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +858bd7d680cdaf0ac53c70d43974a2df ccid-1.0.1.tar.gz From 9c1c9e0c8ca8d1faf0bf85d1d8ef3f672e3d37d9 Mon Sep 17 00:00:00 2001 From: Robert Relyea Date: Mon, 10 Jul 2006 22:03:11 +0000 Subject: [PATCH 03/26] ccid requires pcsc-lite which is not available for s390. Neither are the usb ports or the readers used by ccid --- ccid.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/ccid.spec b/ccid.spec index 3522ec8..44cf5a1 100644 --- a/ccid.spec +++ b/ccid.spec @@ -1,8 +1,10 @@ %define dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null) +%define libusb_ver 0.1.7 +%define pcsc-lite_ver 1.3.1 Name: ccid Version: 1.0.1 -Release: 2 +Release: 3 Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries @@ -11,11 +13,13 @@ URL: http://pcsclite.alioth.debian.org/ccid.html Source0: http://alioth.debian.org/download.php/1563/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libusb-devel >= 0.1.7 -BuildRequires: pcsc-lite-devel >= 1.3.0 -Requires: libusb >= 0.1.7 -Requires: pcsc-lite >= 1.3.0 +BuildRequires: libusb-devel >= %{libusb_ver} +BuildRequires: pcsc-lite-devel >= %{pcsc-lite_ver} +Requires: libusb >= %{libusb_ver} +Requires: pcsc-lite >= %{pcsc-lite_ver} Provides: pcsc-ifd-handler +ExcludeArch: s390 s390x # 390 does not have libusb or smartCards + %description Generic USB CCID (Chip/Smart Card Interface Devices) driver. @@ -61,6 +65,9 @@ fi %changelog +* Mon Jul 10 2006 Bob Relyea - 1.0.1-3 +- remove s390 from the build + * Mon Jun 5 2006 Bob Relyea - 1.0.1-2 - Move to Fedora Core, removed %%{_dist}. From e9deca0fcea7e280b05f88011095f9e5890fd299 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 12 Jul 2006 04:45:27 +0000 Subject: [PATCH 04/26] bumped for rebuild --- ccid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ccid.spec b/ccid.spec index 44cf5a1..0eecefa 100644 --- a/ccid.spec +++ b/ccid.spec @@ -4,7 +4,7 @@ Name: ccid Version: 1.0.1 -Release: 3 +Release: 3.1 Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries @@ -65,6 +65,9 @@ fi %changelog +* Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control +- rebuild + * Mon Jul 10 2006 Bob Relyea - 1.0.1-3 - remove s390 from the build From 6a006832ce404078ee04424d390145f56d274cdd Mon Sep 17 00:00:00 2001 From: Florian La Roche Date: Sun, 16 Jul 2006 18:37:51 +0000 Subject: [PATCH 05/26] - fix excludearch line --- ccid.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ccid.spec b/ccid.spec index 0eecefa..876c891 100644 --- a/ccid.spec +++ b/ccid.spec @@ -4,7 +4,7 @@ Name: ccid Version: 1.0.1 -Release: 3.1 +Release: 4 Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries @@ -18,7 +18,8 @@ BuildRequires: pcsc-lite-devel >= %{pcsc-lite_ver} Requires: libusb >= %{libusb_ver} Requires: pcsc-lite >= %{pcsc-lite_ver} Provides: pcsc-ifd-handler -ExcludeArch: s390 s390x # 390 does not have libusb or smartCards +# 390 does not have libusb or smartCards +ExcludeArch: s390 s390x %description @@ -65,7 +66,10 @@ fi %changelog -* Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control +* Sun Jul 16 2006 Florian La Roche - 1.0.1-4 +- fix excludearch line + +* Wed Jul 12 2006 Jesse Keating - 1.0.1-3.1 - rebuild * Mon Jul 10 2006 Bob Relyea - 1.0.1-3 From 65eb3c1136036ac4e81903714c9082d8b86482f4 Mon Sep 17 00:00:00 2001 From: Florian La Roche Date: Wed, 19 Jul 2006 22:27:17 +0000 Subject: [PATCH 06/26] - require initscripts for post/postun --- ccid.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ccid.spec b/ccid.spec index 876c891..a466d02 100644 --- a/ccid.spec +++ b/ccid.spec @@ -4,7 +4,7 @@ Name: ccid Version: 1.0.1 -Release: 4 +Release: 5 Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries @@ -15,6 +15,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel >= %{libusb_ver} 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 @@ -51,11 +53,13 @@ rm -rf $RPM_BUILD_ROOT %post if [ $1 -eq 1 -a -x %{_initrddir}/pcscd ] ; then - %{_initrddir}/pcscd try-restart >/dev/null || : + %{_initrddir}/pcscd try-restart >/dev/null fi +exit 0 %postun -[ -x %{_initrddir}/pcscd ] && %{_initrddir}/pcscd try-restart >/dev/null || : +[ -x %{_initrddir}/pcscd ] && %{_initrddir}/pcscd try-restart >/dev/null +exit 0 %files From 23e6210dae9d405d334a8cf700e24d9288c72960 Mon Sep 17 00:00:00 2001 From: Robert Relyea Date: Thu, 2 Nov 2006 00:37:05 +0000 Subject: [PATCH 07/26] auto-import ccid-1.1.0-1 on branch devel from ccid-1.1.0-1.src.rpm --- .cvsignore | 2 +- ccid.spec | 16 +++++++++++----- sources | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index c831572..4f7ebef 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ccid-1.0.1.tar.gz +ccid-1.1.0.tar.gz diff --git a/ccid.spec b/ccid.spec index a466d02..fa5107f 100644 --- a/ccid.spec +++ b/ccid.spec @@ -1,10 +1,10 @@ %define dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null) %define libusb_ver 0.1.7 -%define pcsc-lite_ver 1.3.1 +%define pcsc-lite_ver 1.3.2 Name: ccid -Version: 1.0.1 -Release: 5 +Version: 1.1.0 +Release: 1 Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries @@ -36,14 +36,14 @@ done %build -%configure --disable-dependency-tracking --disable-static +%configure --disable-dependency-tracking --disable-static --enable-twinserial make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -make install_ccidtwin -C src DESTDIR=$RPM_BUILD_ROOT +#make install_ccidtwin -C src DESTDIR=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf ./GemPCTwin.reader.conf @@ -70,6 +70,12 @@ exit 0 %changelog +* Thu Nov 02 2006 Bob Relyea - 1.1.0-1 +- Pickup ccid 1.1.0 + +* Sun Jul 20 2006 Florian La Roche - 1.0.1-5 +- require initscripts for post/postun + * Sun Jul 16 2006 Florian La Roche - 1.0.1-4 - fix excludearch line diff --git a/sources b/sources index 0d340a9..dacd9e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -858bd7d680cdaf0ac53c70d43974a2df ccid-1.0.1.tar.gz +3d216cb89030c6a74fb6851bcc80b08e ccid-1.1.0.tar.gz From d6b2c88c5e8eaabc7721f47b2e555d4c21040a49 Mon Sep 17 00:00:00 2001 From: Robert Relyea Date: Mon, 6 Nov 2006 19:46:56 +0000 Subject: [PATCH 08/26] change '-' to '_' in version string. --- ccid.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ccid.spec b/ccid.spec index fa5107f..c6e838f 100644 --- a/ccid.spec +++ b/ccid.spec @@ -1,10 +1,10 @@ %define dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null) %define libusb_ver 0.1.7 -%define pcsc-lite_ver 1.3.2 +%define pcsc_lite_ver 1.3.2 Name: ccid Version: 1.1.0 -Release: 1 +Release: 2 Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries @@ -18,7 +18,7 @@ BuildRequires: pcsc-lite-devel >= %{pcsc-lite_ver} Requires(post): initscripts Requires(postun): initscripts Requires: libusb >= %{libusb_ver} -Requires: pcsc-lite >= %{pcsc-lite_ver} +Requires: pcsc-lite >= %{pcsc_lite_ver} Provides: pcsc-ifd-handler # 390 does not have libusb or smartCards ExcludeArch: s390 s390x @@ -70,6 +70,9 @@ exit 0 %changelog +* Mon Nov 06 2006 Bob Relyea - 1.1.0-2 +- Fix version macro to remove '-' + * Thu Nov 02 2006 Bob Relyea - 1.1.0-1 - Pickup ccid 1.1.0 From a0db4d6d9440e7c20af0d658ad08c60457a8a790 Mon Sep 17 00:00:00 2001 From: Robert Relyea Date: Tue, 6 Feb 2007 18:45:25 +0000 Subject: [PATCH 09/26] auto-import ccid-1.2.1-1.rawhide_bob on branch devel from ccid-1.2.1-1.src.rpm --- .cvsignore | 2 +- ccid.spec | 16 +++++++++------- sources | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4f7ebef..5887c2e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ccid-1.1.0.tar.gz +ccid-1.2.1.tar.gz diff --git a/ccid.spec b/ccid.spec index c6e838f..cd6da64 100644 --- a/ccid.spec +++ b/ccid.spec @@ -1,10 +1,10 @@ %define dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null) %define libusb_ver 0.1.7 -%define pcsc_lite_ver 1.3.2 +%define pcsc_lite_ver 1.3.3 Name: ccid -Version: 1.1.0 -Release: 2 +Version: 1.2.1 +Release: 1%{dist} Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries @@ -52,13 +52,11 @@ rm -rf $RPM_BUILD_ROOT %post -if [ $1 -eq 1 -a -x %{_initrddir}/pcscd ] ; then - %{_initrddir}/pcscd try-restart >/dev/null -fi +[ -x %{_initrddir}/pcscd ] && %{_initrddir}/pcscd status >> /dev/null 2>&1 && %{_sbindir}/pcscd -H > /dev/null 2>&1 exit 0 %postun -[ -x %{_initrddir}/pcscd ] && %{_initrddir}/pcscd try-restart >/dev/null +[ -x %{_initrddir}/pcscd ] && %{_initrddir}/pcscd status >> /dev/null 2>&1 && %{_sbindir}/pcscd -H > /dev/null 2>&1 exit 0 @@ -70,6 +68,10 @@ exit 0 %changelog +* Tue Feb 06 2007 Bob Relyea - 1.2.1-1 +- Pick up ccid 1.2.1 +- use pcscd 'hotplug' feature instead of restarting the daemon + * Mon Nov 06 2006 Bob Relyea - 1.1.0-2 - Fix version macro to remove '-' diff --git a/sources b/sources index dacd9e2..e8c43b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3d216cb89030c6a74fb6851bcc80b08e ccid-1.1.0.tar.gz +13353ad33b06d2cd086bbcaee6402119 ccid-1.2.1.tar.gz From 18721c5999586cb7a624efaef75cd01bbe509101 Mon Sep 17 00:00:00 2001 From: Robert Relyea Date: Wed, 7 Feb 2007 02:22:01 +0000 Subject: [PATCH 10/26] add -udev support --- ccid.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ccid.spec b/ccid.spec index cd6da64..eba6ae8 100644 --- a/ccid.spec +++ b/ccid.spec @@ -36,7 +36,7 @@ done %build -%configure --disable-dependency-tracking --disable-static --enable-twinserial +%configure --disable-dependency-tracking --disable-static --enable-twinserial --enable-udev make %{?_smp_mflags} @@ -45,6 +45,8 @@ 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 +%{__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 %clean @@ -65,12 +67,14 @@ exit 0 %doc AUTHORS ChangeLog COPYING README GemPCTwin.reader.conf %{dropdir}/ifd-ccid.bundle/ %{dropdir}/serial/ +%config %{_sysconfdir}/udev/rules.d/85-pcscd_ccid.rules %changelog * Tue Feb 06 2007 Bob Relyea - 1.2.1-1 - Pick up ccid 1.2.1 - use pcscd 'hotplug' feature instead of restarting the daemon +- add enable_udev * Mon Nov 06 2006 Bob Relyea - 1.1.0-2 - Fix version macro to remove '-' From d85bfe8d44c9677deddeb3dfe3872bcb16e86553 Mon Sep 17 00:00:00 2001 From: Robert Relyea Date: Mon, 30 Apr 2007 20:40:29 +0000 Subject: [PATCH 11/26] Bug 238321: pcsc-lite_ver is undefined. Should be pcsc_lite_ver. --- ccid.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ccid.spec b/ccid.spec index eba6ae8..d4c3947 100644 --- a/ccid.spec +++ b/ccid.spec @@ -4,7 +4,7 @@ Name: ccid Version: 1.2.1 -Release: 1%{dist} +Release: 2%{dist} Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries @@ -14,7 +14,7 @@ Source0: http://alioth.debian.org/download.php/1563/%{name}-%{version}.ta BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel >= %{libusb_ver} -BuildRequires: pcsc-lite-devel >= %{pcsc-lite_ver} +BuildRequires: pcsc-lite-devel >= %{pcsc_lite_ver} Requires(post): initscripts Requires(postun): initscripts Requires: libusb >= %{libusb_ver} @@ -71,6 +71,9 @@ exit 0 %changelog +* Mon Apr 30 2007 Bob Relyea - 1.2.1-2 +- Fix the missed use of the version macro + * Tue Feb 06 2007 Bob Relyea - 1.2.1-1 - Pick up ccid 1.2.1 - use pcscd 'hotplug' feature instead of restarting the daemon From 75de525ef6c177606ac408b8657ebeb87ede0150 Mon Sep 17 00:00:00 2001 From: Robert Relyea Date: Tue, 21 Aug 2007 01:54:40 +0000 Subject: [PATCH 12/26] Update License description to the new Fedora standard --- ccid.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ccid.spec b/ccid.spec index d4c3947..143c0de 100644 --- a/ccid.spec +++ b/ccid.spec @@ -4,11 +4,11 @@ Name: ccid Version: 1.2.1 -Release: 2%{dist} +Release: 3%{dist} Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries -License: LGPL +License: LGPLv2+ URL: http://pcsclite.alioth.debian.org/ccid.html Source0: http://alioth.debian.org/download.php/1563/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -71,6 +71,9 @@ exit 0 %changelog +* Fri Aug 20 2007 Bob Relyea - 1.2.1-3 +- Update License description to the new Fedora standard + * Mon Apr 30 2007 Bob Relyea - 1.2.1-2 - Fix the missed use of the version macro From e02a41bd98393e795e80d6fe1f950ecbe1ecbb42 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 18:39:18 +0000 Subject: [PATCH 13/26] makefile update to properly grab makefile.common --- Makefile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4520840..8b0ec1f 100644 --- a/Makefile +++ b/Makefile @@ -3,4 +3,19 @@ NAME := ccid SPECFILE = $(firstword $(wildcard *.spec)) -include ../common/Makefile.common +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attempt a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) From 18310b64866b211a35c141e5bfb3b616c77c9fab Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 22:30:26 +0000 Subject: [PATCH 14/26] - Autorebuild for GCC 4.3 --- ccid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ccid.spec b/ccid.spec index 143c0de..bee6a1e 100644 --- a/ccid.spec +++ b/ccid.spec @@ -4,7 +4,7 @@ Name: ccid Version: 1.2.1 -Release: 3%{dist} +Release: 4%{dist} Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries @@ -71,6 +71,9 @@ exit 0 %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 1.2.1-4 +- Autorebuild for GCC 4.3 + * Fri Aug 20 2007 Bob Relyea - 1.2.1-3 - Update License description to the new Fedora standard From c36d1aeba99188c1a8fdb7dafa7cb67f0a1327d3 Mon Sep 17 00:00:00 2001 From: Robert Relyea Date: Thu, 28 Aug 2008 00:39:07 +0000 Subject: [PATCH 15/26] updgrade to ccid 1.3.8 --- .cvsignore | 2 +- ccid.spec | 17 +++++++++++++---- import.log | 1 + sources | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index 5887c2e..c589c86 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ccid-1.2.1.tar.gz +ccid-1.3.8.tar.bz2 diff --git a/ccid.spec b/ccid.spec index bee6a1e..ff75d6f 100644 --- a/ccid.spec +++ b/ccid.spec @@ -3,14 +3,14 @@ %define pcsc_lite_ver 1.3.3 Name: ccid -Version: 1.2.1 -Release: 4%{dist} +Version: 1.3.8 +Release: 1%{dist} Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries License: LGPLv2+ URL: http://pcsclite.alioth.debian.org/ccid.html -Source0: http://alioth.debian.org/download.php/1563/%{name}-%{version}.tar.gz +Source0: http://alioth.debian.org/download.php/1563/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libusb-devel >= %{libusb_ver} @@ -45,6 +45,7 @@ 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 @@ -64,13 +65,21 @@ exit 0 %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README GemPCTwin.reader.conf +%doc AUTHORS ChangeLog COPYING README GemPCTwin.reader.conf README_Kobil_mIDentity_switch.txt %{dropdir}/ifd-ccid.bundle/ %{dropdir}/serial/ %config %{_sysconfdir}/udev/rules.d/85-pcscd_ccid.rules +%{_bindir}/RSA_SecurID_getpasswd +%{_mandir}/man1/RSA_SecurID_getpasswd.1.gz +%{_mandir}/man8/Kobil_mIDentity_switch.8.gz +%{_sbindir}/Kobil_mIDentity_switch +#%doc /doc/ccid/ %changelog +* Tue Aug 26 2008 Bob Relyea - 1.3.8-1 +- update to ccid 1.3.8 + * Tue Feb 19 2008 Fedora Release Engineering - 1.2.1-4 - Autorebuild for GCC 4.3 diff --git a/import.log b/import.log new file mode 100644 index 0000000..182e5bc --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +ccid-1_3_8-1_rhel5_bob:HEAD:ccid-1.3.8-1.rhel5_bob.src.rpm:1219884136 diff --git a/sources b/sources index e8c43b4..2d89d81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13353ad33b06d2cd086bbcaee6402119 ccid-1.2.1.tar.gz +ebb5fc927d73cd63737a9114481e8957 ccid-1.3.8.tar.bz2 From 1bab97b5f4637880cc1d96c8df4111d6be63c702 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 06:40:47 +0000 Subject: [PATCH 16/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- ccid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ccid.spec b/ccid.spec index ff75d6f..74bab24 100644 --- a/ccid.spec +++ b/ccid.spec @@ -4,7 +4,7 @@ Name: ccid Version: 1.3.8 -Release: 1%{dist} +Release: 2%{dist} Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries @@ -77,6 +77,9 @@ exit 0 %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 1.3.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Aug 26 2008 Bob Relyea - 1.3.8-1 - update to ccid 1.3.8 From 89ee660df86a522a4b0b11dec751654132ffc659 Mon Sep 17 00:00:00 2001 From: Robert Relyea Date: Tue, 3 Mar 2009 22:49:51 +0000 Subject: [PATCH 17/26] Fix URL in spec. Update to 1.3.9 --- .cvsignore | 2 +- ccid.spec | 10 +++++++--- import.log | 1 + sources | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index c589c86..f197d63 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ccid-1.3.8.tar.bz2 +ccid-1.3.9.tar.bz2 diff --git a/ccid.spec b/ccid.spec index 74bab24..be5557a 100644 --- a/ccid.spec +++ b/ccid.spec @@ -1,16 +1,17 @@ %define dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null) %define libusb_ver 0.1.7 %define pcsc_lite_ver 1.3.3 +%define upstream_build 2656 Name: ccid -Version: 1.3.8 -Release: 2%{dist} +Version: 1.3.9 +Release: 1%{dist} Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries License: LGPLv2+ URL: http://pcsclite.alioth.debian.org/ccid.html -Source0: http://alioth.debian.org/download.php/1563/%{name}-%{version}.tar.bz2 +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} @@ -77,6 +78,9 @@ exit 0 %changelog +* Tue Feb 24 2009 Bob Relyea - 1.3.9-1 +- update to ccid 1.3.9 + * Mon Feb 23 2009 Fedora Release Engineering - 1.3.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/import.log b/import.log index 182e5bc..3fdefeb 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ ccid-1_3_8-1_rhel5_bob:HEAD:ccid-1.3.8-1.rhel5_bob.src.rpm:1219884136 +ccid-1_3_9-1_rhel5_bob:HEAD:ccid-1.3.9-1.rhel5_bob.src.rpm:1236042353 diff --git a/sources b/sources index 2d89d81..f1ef32e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ebb5fc927d73cd63737a9114481e8957 ccid-1.3.8.tar.bz2 +4459f8389d9b3e086e2e2ed09b0e2f58 ccid-1.3.9.tar.bz2 From 5736b0fd7e38bb7a4068e1f461712dd934260ca0 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 18:41:50 +0000 Subject: [PATCH 18/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- ccid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ccid.spec b/ccid.spec index be5557a..2e570b3 100644 --- a/ccid.spec +++ b/ccid.spec @@ -5,7 +5,7 @@ Name: ccid Version: 1.3.9 -Release: 1%{dist} +Release: 2%{dist} Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries @@ -78,6 +78,9 @@ exit 0 %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 1.3.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Feb 24 2009 Bob Relyea - 1.3.9-1 - update to ccid 1.3.9 From e1a0499af59429d9c91c3211576f5631e0d72b81 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 19 Nov 2009 12:04:07 +0000 Subject: [PATCH 19/26] Updated to ccid 1.3.11 --- .cvsignore | 2 +- ccid.spec | 17 +++++++++-------- sources | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index f197d63..8c7d5d9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ccid-1.3.9.tar.bz2 +ccid-1.3.11.tar.bz2 diff --git a/ccid.spec b/ccid.spec index 2e570b3..3465610 100644 --- a/ccid.spec +++ b/ccid.spec @@ -1,17 +1,17 @@ %define dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null) %define libusb_ver 0.1.7 -%define pcsc_lite_ver 1.3.3 -%define upstream_build 2656 +%define pcsc_lite_ver 1.5.3 +%define upstream_build 3080 Name: ccid -Version: 1.3.9 -Release: 2%{dist} +Version: 1.3.11 +Release: 1%{dist} Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries License: LGPLv2+ URL: http://pcsclite.alioth.debian.org/ccid.html -Source0: http://alioth.debian.org/download.php/%{upstream-build}/%{name}-%{version}.tar.bz2 +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} @@ -31,9 +31,6 @@ Generic USB CCID (Chip/Smart Card Interface Devices) driver. %prep %setup -q -for f in ChangeLog README ; do - iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f -done %build @@ -78,6 +75,10 @@ exit 0 %changelog +* Wed Nov 19 2009 Kalev Lember - 1.3.11-1 +- Updated to ccid 1.3.11 +- Removed iso-8859-1 to utf-8 conversion as the files are in utf-8 now + * Fri Jul 24 2009 Fedora Release Engineering - 1.3.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index f1ef32e..2365a74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4459f8389d9b3e086e2e2ed09b0e2f58 ccid-1.3.9.tar.bz2 +727dc7eb4d560f81fe70a766a96de970 ccid-1.3.11.tar.bz2 From dbaf4beb0b707d22dcff5bedb7cc1d683eb3b446 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:47:29 +0000 Subject: [PATCH 20/26] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8b0ec1f..5a028db 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := ccid SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 70334d4163be7b6f0253080b9248622c622a9dea Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 3 Jul 2010 23:14:37 +0000 Subject: [PATCH 21/26] Update to 1.3.13 --- .cvsignore | 2 +- ccid.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8c7d5d9..0643d8c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ccid-1.3.11.tar.bz2 +ccid-1.3.13.tar.bz2 diff --git a/ccid.spec b/ccid.spec index 3465610..83ddb3c 100644 --- a/ccid.spec +++ b/ccid.spec @@ -1,10 +1,10 @@ %define dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null) %define libusb_ver 0.1.7 -%define pcsc_lite_ver 1.5.3 -%define upstream_build 3080 +%define pcsc_lite_ver 1.6.0 +%define upstream_build 3300 Name: ccid -Version: 1.3.11 +Version: 1.3.13 Release: 1%{dist} Summary: Generic USB CCID smart card reader driver @@ -75,6 +75,9 @@ exit 0 %changelog +* Sun Jul 04 2010 Kalev Lember - 1.3.13-1 +- Update to 1.3.13 + * Wed Nov 19 2009 Kalev Lember - 1.3.11-1 - Updated to ccid 1.3.11 - Removed iso-8859-1 to utf-8 conversion as the files are in utf-8 now diff --git a/sources b/sources index 2365a74..2e63810 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -727dc7eb4d560f81fe70a766a96de970 ccid-1.3.11.tar.bz2 +275360cb253299b763e1122adf847265 ccid-1.3.13.tar.bz2 From b71579a360d99488e787748e213d2caa60ec0dea Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 3 Jul 2010 23:15:22 +0000 Subject: [PATCH 22/26] removed import.log --- import.log | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 import.log diff --git a/import.log b/import.log deleted file mode 100644 index 3fdefeb..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -ccid-1_3_8-1_rhel5_bob:HEAD:ccid-1.3.8-1.rhel5_bob.src.rpm:1219884136 -ccid-1_3_9-1_rhel5_bob:HEAD:ccid-1.3.9-1.rhel5_bob.src.rpm:1236042353 From d65b4e506cbe823d1e6812b85cc1fdfd843d3692 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:29:37 +0000 Subject: [PATCH 23/26] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 5a028db..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ccid -# $Id$ -NAME := ccid -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 6b3971c6a94eaabade8013aed9e85de26c0577b9 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 4 Aug 2010 17:48:18 +0300 Subject: [PATCH 24/26] 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 From 76f9fbb122fe38b468ab04abd9a094721501dd5a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 4 Aug 2010 18:00:44 +0300 Subject: [PATCH 25/26] Spec file clean up --- ccid.spec | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/ccid.spec b/ccid.spec index 5392c24..c96f291 100644 --- a/ccid.spec +++ b/ccid.spec @@ -1,6 +1,6 @@ -%define dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null) -%define pcsc_lite_ver 1.6.2 -%define upstream_build 3333 +%global dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null) +%global pcsc_lite_ver 1.6.2 +%global upstream_build 3333 Name: ccid Version: 1.4.0 @@ -32,7 +32,7 @@ Generic USB CCID (Chip/Smart Card Interface Devices) driver. %build -%configure --disable-dependency-tracking --disable-static --enable-twinserial --enable-udev +%configure --enable-twinserial --enable-udev make %{?_smp_mflags} @@ -40,8 +40,7 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT 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 +install -Dpm 644 src/pcscd_ccid.rules $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/85-pcscd_ccid.rules %clean @@ -65,10 +64,9 @@ exit 0 %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 -%{_mandir}/man8/Kobil_mIDentity_switch.8.gz +%{_mandir}/man1/RSA_SecurID_getpasswd.1* +%{_mandir}/man8/Kobil_mIDentity_switch.8* %{_sbindir}/Kobil_mIDentity_switch -#%doc /doc/ccid/ %changelog @@ -76,6 +74,7 @@ exit 0 - Update to 1.4.0 - Build against libusb1 instead of libusb 0.1 - Install libccidtwin configuration file +- Spec file clean up * Sun Jul 04 2010 Kalev Lember - 1.3.13-1 - Update to 1.3.13 From 3e2e4c1d69736bb3d33a63da88d6640fa66feb8c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 7 Dec 2010 11:10:50 +0200 Subject: [PATCH 26/26] Removed ExcludeArch s390 s390x and updated description --- ccid.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ccid.spec b/ccid.spec index c96f291..f40893b 100644 --- a/ccid.spec +++ b/ccid.spec @@ -4,7 +4,7 @@ Name: ccid Version: 1.4.0 -Release: 1%{dist} +Release: 2%{dist} Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries @@ -19,12 +19,10 @@ Requires(post): initscripts Requires(postun): initscripts Requires: pcsc-lite >= %{pcsc_lite_ver} Provides: pcsc-ifd-handler -# 390 does not have libusb or smartCards -ExcludeArch: s390 s390x - %description -Generic USB CCID (Chip/Smart Card Interface Devices) driver. +Generic USB CCID (Chip/Smart Card Interface Devices) driver for use with the +PC/SC Lite daemon. %prep @@ -70,6 +68,10 @@ exit 0 %changelog +* Tue Dec 07 2010 Kalev Lember - 1.4.0-2 +- Removed ExcludeArch: s390 s390x as these arches now have libusb1 +- Updated description + * Wed Aug 04 2010 Kalev Lember - 1.4.0-1 - Update to 1.4.0 - Build against libusb1 instead of libusb 0.1