diff --git a/pcsc-lite-1.8.10.tar.bz2 b/pcsc-lite-1.8.10.tar.bz2 deleted file mode 100644 index cd3169c..0000000 --- a/pcsc-lite-1.8.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:607c4bd730526d282a63edb2ba4ee043f497877be642c5c647e37995e21f2612 -size 561707 diff --git a/pcsc-lite-1.8.10.tar.bz2.asc b/pcsc-lite-1.8.10.tar.bz2.asc deleted file mode 100644 index f749d6e..0000000 --- a/pcsc-lite-1.8.10.tar.bz2.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.14 (GNU/Linux) - -iEYEABECAAYFAlJitj0ACgkQP0qKj+B/HPnp6ACffF78it2sVwf+SSLKmzjZ0SRw -LdMAniO/mxmOhIG5znBuXCXM0T167Ual -=cZjK ------END PGP SIGNATURE----- diff --git a/pcsc-lite-1.8.11.tar.bz2 b/pcsc-lite-1.8.11.tar.bz2 new file mode 100644 index 0000000..6bb1a69 --- /dev/null +++ b/pcsc-lite-1.8.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:945041c94c53959ae5a767616a4ec5099fe67f549bfd344e8bd0cfe7a3c71ac6 +size 571837 diff --git a/pcsc-lite-1.8.11.tar.bz2.asc b/pcsc-lite-1.8.11.tar.bz2.asc new file mode 100644 index 0000000..2fd6bfe --- /dev/null +++ b/pcsc-lite-1.8.11.tar.bz2.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlL+QdsACgkQP0qKj+B/HPk8jQCcDUFitZ1LqK1VQ6pEiXHbOyKy +n8YAoJf0Sbc4FCRbmGXZV2gZy5NkoH0c +=w0Lj +-----END PGP SIGNATURE----- diff --git a/pcsc-lite.changes b/pcsc-lite.changes index d82c0e8..17160d0 100644 --- a/pcsc-lite.changes +++ b/pcsc-lite.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Apr 22 13:55:53 UTC 2014 - wr@rosenauer.org + +- removed rc script from 13.1 and above +- do not use polkit for now + +------------------------------------------------------------------- +Sat Feb 15 20:52:47 UTC 2014 - wr@rosenauer.org + +- Updated to version 1.8.11 + * Add polkit support. See doc/README.polkit + * /etc/reader.conf: CHANNELID and DEVICENAME are both optional but + not at the same time + * Some other minor improvements and bug corrections + +------------------------------------------------------------------- +Sun Dec 1 18:23:59 UTC 2013 - wr@rosenauer.org + +- remove dependency on sysvinit(syslog) starting with 13.1 + ------------------------------------------------------------------- Sun Oct 20 16:38:24 UTC 2013 - wr@rosenauer.org diff --git a/pcsc-lite.spec b/pcsc-lite.spec index 7716961..39433cf 100644 --- a/pcsc-lite.spec +++ b/pcsc-lite.spec @@ -1,7 +1,7 @@ # # spec file for package pcsc-lite # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -21,6 +21,7 @@ Name: pcsc-lite %define ifddir %{_libdir}/readers BuildRequires: libtool BuildRequires: pkg-config +BuildRequires: polkit-devel BuildRequires: readline-devel %if %suse_version >= 1120 BuildRequires: libudev-devel @@ -36,7 +37,7 @@ BuildRequires: systemd %if %suse_version > 1220 BuildRequires: gpg-offline %endif -Version: 1.8.10 +Version: 1.8.11 Release: 0 Requires(pre): pwdutils Url: http://pcsclite.alioth.debian.org/ @@ -53,9 +54,10 @@ Source6: pcsc-lite-reader-conf Source7: %{name}-%{version}.tar.bz2.asc Source8: %{name}.keyring Patch0: systemd-service.patch -Requires(post): %insserv_prereq %fillup_prereq -%if %suse_version > 1130 +Requires(post): %fillup_prereq +%if %suse_version < 1310 PreReq: sysvinit(syslog) +Requires(post): %insserv_prereq %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %define USER scard @@ -155,8 +157,12 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/ sed s:@ifddir@:%{ifddir}: $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/reader.conf # this program is noinst in the package #install src/.libs/testpcsc $RPM_BUILD_ROOT%{_sbindir}/ +%if %suse_version < 1310 install -D -m 755 pcsc-lite-init $RPM_BUILD_ROOT%{_initrddir}/pcscd ln -sf %{_initrddir}/pcscd $RPM_BUILD_ROOT%{_sbindir}/rcpcscd +%else +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcpcscd +%endif 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} @@ -186,13 +192,19 @@ exit 0 /bin/systemctl try-restart pcscd.service || : /bin/systemctl restart pcscd.socket || : %endif +%if %suse_version < 1310 %fillup_and_insserv -y -n pcscd pcscd +%else +%fillup_only pcscd +%endif %preun %if %suse_version > 1140 %service_del_preun pcscd.service pcscd.socket %endif +%if %suse_version < 1310 %stop_on_removal pcscd +%endif %postun %if %suse_version > 1140 @@ -202,8 +214,10 @@ if [ "$1" = "1" ]; then /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi %endif +%if %suse_version < 1310 %restart_on_update pcscd %insserv_cleanup +%endif %post -n libpcsclite1 -p /sbin/ldconfig @@ -225,6 +239,7 @@ fi %{_docdir}/%{name}/README %{_docdir}/%{name}/README.DAEMON %{_docdir}/%{name}/README.SUSE +%{_docdir}/%{name}/README.polkit %{_docdir}/%{name}/SECURITY %{_docdir}/%{name}/TODO %doc %{_mandir}/man?/*.* @@ -235,10 +250,13 @@ fi %if %suse_version > 1140 %_unitdir/* %endif +%if %suse_version < 1310 %{_initrddir}/pcscd +%endif /var/adm/fillup-templates/sysconfig.pcscd # libpcsclite.so should stay in the main package (#732911). Third party packages may need it for dlopen(). %{_libdir}/libpcsclite.so +#%{_datadir}/polkit-1/actions/org.debian.pcsc-lite.policy %files -n libpcsclite1 %defattr(-,root,root)