diff --git a/pcsc-lite-1.8.1.tar.bz2 b/pcsc-lite-1.8.1.tar.bz2 deleted file mode 100644 index 53bbc4c..0000000 --- a/pcsc-lite-1.8.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eba006db63d1a67d2314be760e19572c71cec816e51db05da28a41714a6049e0 -size 546082 diff --git a/pcsc-lite-1.8.2.tar.bz2 b/pcsc-lite-1.8.2.tar.bz2 new file mode 100644 index 0000000..b89bcc9 --- /dev/null +++ b/pcsc-lite-1.8.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5525c7fff09e855ca75203256a1c5acc518dae8740867d41e10b75c55d94a364 +size 548706 diff --git a/pcsc-lite.changes b/pcsc-lite.changes index cd299c4..9be72df 100644 --- a/pcsc-lite.changes +++ b/pcsc-lite.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jan 19 12:38:48 UTC 2012 - wr@rosenauer.org + +- Updated to version 1.8.2 + * rename pcsc-spy.py to pcsc-spy + * pcsc-spy.1 manpage + * fix a bug with a multi-slot reader + * Info.plist parser: avoid a buffer read overflow in & + management +- moved internal changelogs to devel package + ------------------------------------------------------------------- Wed Dec 7 19:34:17 CET 2011 - sbrabec@suse.cz diff --git a/pcsc-lite.spec b/pcsc-lite.spec index 4e64114..9543b86 100644 --- a/pcsc-lite.spec +++ b/pcsc-lite.spec @@ -1,7 +1,7 @@ # # spec file for package pcsc-lite # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: pcsc-lite # FIXME: Maybe we should use /usr/lib/pcsc/drivers as others do: %define ifddir %{_libdir}/readers -BuildRequires: libtool pkg-config readline-devel +BuildRequires: libtool +BuildRequires: pkg-config +BuildRequires: readline-devel %if %suse_version >= 1120 #shouldn't be found automagically ? BuildRequires: libudev-devel @@ -33,13 +33,13 @@ BuildRequires: libusb-1_0-devel BuildRequires: systemd %{?systemd_requires} %endif -Version: 1.8.1 -Release: 1 +Version: 1.8.2 +Release: 0 Requires(pre): pwdutils -Group: Productivity/Security -License: BSD3c(or similar) Url: http://pcsclite.alioth.debian.org/ Summary: PCSC Smart Cards Library +License: BSD-3-Clause +Group: Productivity/Security Source: %{name}-%{version}.tar.bz2 Source1: %{name}.sysconfig Source2: README.SUSE @@ -75,9 +75,8 @@ This functionality is exercised in the driver. %package -n libpcsclite1 -License: BSD3c(or similar) -Group: System/Libraries Summary: PCSC Smart Card Library +Group: System/Libraries Recommends: pcsc-lite >= %{version} %description -n libpcsclite1 @@ -99,21 +98,20 @@ This functionality is exercised in the driver. %package -n libpcscspy0 -License: BSD3c(or similar) -Group: System/Libraries Summary: PCSC Smart Card Library +Group: System/Libraries %description -n libpcscspy0 Supporting library for the PC/SC spy tool. %package devel -License: BSD3c(or similar) -Group: Development/Libraries/C and C++ Summary: Development package for the MUSCLE project SmartCards library +Group: Development/Libraries/C and C++ Requires: %{name} = %{version}-%{release} Requires: libpcsclite1 = %{version}-%{release} Requires: libpcscspy0 = %{version}-%{release} +Requires: glibc-devel %description devel This package contains the development files for pcsc-lite. It allows to @@ -154,7 +152,7 @@ ln -sf %{_initrddir}/pcscd $RPM_BUILD_ROOT%{_sbindir}/rcpcscd mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates cp %{name}.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.pcscd mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} -cp -a AUTHORS ChangeLog ChangeLog.svn COPYING DRIVERS HELP README README.SUSE SECURITY TODO $RPM_BUILD_ROOT%{_docdir}/%{name} +cp -a AUTHORS ChangeLog ChangeLog.svn COPYING DRIVERS HELP NEWS README README.SUSE SECURITY TODO $RPM_BUILD_ROOT%{_docdir}/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -204,9 +202,21 @@ fi %files %defattr(-,root,root) -%doc %{_docdir}/%{name} +%docdir %{_docdir}/%{name} +%dir %{_docdir}/%{name} +%{_docdir}/%{name}/AUTHORS +%{_docdir}/%{name}/COPYING +%{_docdir}/%{name}/DRIVERS +%{_docdir}/%{name}/HELP +%{_docdir}/%{name}/NEWS +%{_docdir}/%{name}/README +%{_docdir}/%{name}/README.DAEMON +%{_docdir}/%{name}/README.SUSE +%{_docdir}/%{name}/SECURITY +%{_docdir}/%{name}/TODO %doc %{_mandir}/man?/*.* %{_sbindir}/* +%{_bindir}/* %dir %{_sysconfdir}/reader.conf.d %config(noreplace) %{_sysconfdir}/reader.conf.d/reader.conf %{ifddir} @@ -228,6 +238,9 @@ fi %files devel %defattr(-,root,root) +%docdir %{_docdir}/%{name} +%dir %{_docdir}/%{name} +%{_docdir}/%{name}/Change* %{_includedir}/* %{_libdir}/*.*a %{_libdir}/pkgconfig/*.pc diff --git a/pre_checkin.sh b/pre_checkin.sh index 10db53b..0c2cc8e 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -1,10 +1,10 @@ #! /bin/sh # -# (C) 2006, jw@suse.de -# Distribute freely. Use and modify with care. +# (C) 2006, jw@suse.de +# Distribute freely. Use and modify with care. # No warranty. -# -# This script tests the source tar-balls +# +# This script tests the source tar-balls # against files that we want to exclude. # diff --git a/systemd-service.patch b/systemd-service.patch index 682645a..24ce82e 100644 --- a/systemd-service.patch +++ b/systemd-service.patch @@ -1,5 +1,5 @@ diff --git a/etc/pcscd.service.in b/etc/pcscd.service.in -index 68dcfaa..8e632c8 100644 +index 7934050..ddbdcc4 100644 --- a/etc/pcscd.service.in +++ b/etc/pcscd.service.in @@ -3,7 +3,9 @@ Description=PC/SC Smart Card Daemon @@ -11,5 +11,5 @@ index 68dcfaa..8e632c8 100644 +EnvironmentFile=-/etc/sysconfig/pcscd +ExecStart=@sbindir_exp@/pcscd --foreground --auto-exit $PCSCD_OPTIONS ExecReload=@sbindir_exp@/pcscd --hotplug - StandardOutput=syslog + [Install]