.gitignore

@@ -14,13 +14,3 @@
 /pcsc-lite-1.8.24.tar.bz2.asc
 /pcsc-lite-1.8.25.tar.bz2.asc
 /pcsc-lite-1.8.26.tar.bz2.asc
-/pcsc-lite-1.9.0.tar.bz2.asc
-/pcsc-lite-1.9.1.tar.bz2.asc
-/pcsc-lite-1.9.2.tar.bz2.asc
-/pcsc-lite-1.9.3.tar.bz2.asc
-/pcsc-lite-1.9.4.tar.bz2.asc
-/pcsc-lite-1.9.5.tar.bz2.asc
-/pcsc-lite-1.9.6.tar.bz2.asc
-/pcsc-lite-1.9.7.tar.bz2.asc
-/pcsc-lite-1.9.8.tar.bz2.asc
-/pcsc-lite-1.9.9.tar.bz2.asc

org.debian.pcsc-lite.policy

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
+<policyconfig>
+  <vendor>The PCSC-lite Project</vendor>
+  <vendor_url>http://pcsclite.alioth.debian.org/</vendor_url>
+<!--  <icon_name>smart-card</icon_name> -->
+
+  <action id="org.debian.pcsc-lite.access_pcsc">
+    <description>Access to the PC/SC daemon</description>
+    <message>Authentication is required to access the PC/SC daemon</message>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+
+  <action id="org.debian.pcsc-lite.access_card">
+    <description>Access to the smart card</description>
+    <message>Authentication is required to access the smart card</message>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+
+</policyconfig>

pcsc-lite.spec

@@ -1,30 +1,20 @@
-# doesn't make sense to install a polkit configuration inside a Flatpak
-%if 0%{?flatpak}
-%global with_polkit 0
-%else
-%global with_polkit 1
-%endif
-
 Name:           pcsc-lite
-Version:        1.9.9
-Release:        3%{?dist}
+Version:        1.8.26
+Release:        1%{?dist}
 Summary:        PC/SC Lite smart card framework and applications
 
 License:        BSD
 URL:            https://pcsclite.apdu.fr/
 Source0:        https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2
 Source1:        https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2.asc
-Source2:        gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
+Source2:	gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
+Source3:	org.debian.pcsc-lite.policy
 
-BuildRequires:  make
 BuildRequires:  doxygen
 BuildRequires:  graphviz
 BuildRequires:  systemd-devel
-BuildRequires:  systemd-rpm-macros
 BuildRequires:  /usr/bin/pod2man
-%if %{with_polkit}
 BuildRequires:  polkit-devel
-%endif
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gettext-devel
@@ -32,19 +22,17 @@ BuildRequires:  libtool
 BuildRequires:  gnupg2
 BuildRequires:  gcc
 BuildRequires:  python3-devel
-BuildRequires:  flex
+BuildRequires:  /usr/bin/pathfix.py
 
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
 Requires:       pcsc-ifd-handler
 Requires:       %{name}-libs = %{version}-%{release}
-%if %{with_polkit}
 Requires:       polkit
-%endif
 Requires:       python3
 Recommends:     pcsc-lite-ccid
-# This is bundled in upstream without simple way to remove
+# This is bundled in upstream withou simple way to remove
 Provides:       bundled(simclist) = 1.6
 
 
@@ -95,18 +83,19 @@ done
 %build
 %configure \
   --disable-static \
-%if %{with_polkit}
   --enable-polkit \
-%endif
-  --with-systemdsystemunitdir=%{_unitdir} \
   --enable-usbdropdir=%{_libdir}/pcsc/drivers
-%make_build
+make %{?_smp_mflags}
 doxygen doc/doxygen.conf ; rm -f doc/api/*.{map,md5}
-%py3_shebang_fix src/spy/pcsc-spy
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" src/spy/pcsc-spy
 
 
 %install
-%make_install
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/org.debian.pcsc-lite.policy
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/
+install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/
 
 # Create empty directories
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d
@@ -115,6 +104,9 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/pcscd
 
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
+# Remove documentation installed in a wrong directory
+rm $RPM_BUILD_ROOT%{_docdir}/pcsc-lite/README.DAEMON
+
 
 %post
 %systemd_post pcscd.socket pcscd.service
@@ -140,7 +132,6 @@ fi
 %files
 %doc AUTHORS ChangeLog HELP README SECURITY TODO
 %doc doc/README.polkit
-%doc install_spy.sh uninstall_spy.sh
 %dir %{_sysconfdir}/reader.conf.d/
 %{_unitdir}/pcscd.service
 %{_unitdir}/pcscd.socket
@@ -149,10 +140,8 @@ fi
 %dir %{_libdir}/pcsc/drivers/
 %{_mandir}/man5/reader.conf.5*
 %{_mandir}/man8/pcscd.8*
-%ghost %dir %{_localstatedir}/run/pcscd/
-%if %{with_polkit}
 %{_datadir}/polkit-1/actions/org.debian.pcsc-lite.policy
-%endif
+%ghost %dir %{_localstatedir}/run/pcscd/
 
 %files libs
 %license COPYING
@@ -171,70 +160,6 @@ fi
 
 
 %changelog
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.9-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Nov 01 2022 Jakub Jelen <jjelen@redhat.com> - 1.9.9-2
-- Remove downstream patch breaking flatpak (#2054826)
-
-* Mon Sep 19 2022 Jakub Jelen <jjelen@redhat.com> - 1.9.9-1
-- New upstream release (#2126065)
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Jakub Jelen <jjelen@redhat.com> - 1.9.8-1
-- New upstream release (#2095962)
-
-* Fri May 13 2022 Jakub Jelen <jjelen@redhat.com> - 1.9.7-1
-- New upstream release (#2085514)
-
-* Thu May 12 2022 Jakub Jelen <jjelen@redhat.com> - 1.9.6-1
-- New upstream release (#2084468)
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Dec 06 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.5-1
-- New upstream release (#2029098)
-
-* Mon Oct 04 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.4-1
-- New upstream release (#2009927)
-
-* Mon Aug 09 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.3-1
-- New upstream release (#1991071)
-
-* Wed Aug 04 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.2-1
-- New upstream release (#1989875)
-
-* Fri Jul 23 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.1-5
-- Use upstream polkit policy to avoid annoying prompts in remote sessions (#1478345)
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 25 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.1-3
-- Add support for more readers
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.9.1-2
-- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Thu Feb 25 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.1-1
-- New upstream release (#1932519)
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jun 15 2020 Jakub Jelen <jjelen@redhat.com> - 1.9.0-1
-- New upstream release (#1846925)
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.26-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Mon Jan 20 2020 Jakub Jelen <jjelen@redhat.com> - 1.8.26-1
 - New upstream release
 

sources

@@ -1,2 +1,2 @@
-SHA512 (pcsc-lite-1.9.9.tar.bz2) = 748ec3d82ff48af1a8dc5a581863e5d94adc47ab8f3158ceb838c2b521ece3a746b737c7b4bb2ba8b545be85ff18b9639443864e50b2e065cf2fbfdf79ef9700
-SHA512 (pcsc-lite-1.9.9.tar.bz2.asc) = b2f81fb9ec4dfdf73fce16b139206a5d606038d728ec6a5cdc5d3fb13b908add597baa490df9132155714b295222fef62ae2e0b50de212461af9ac8008297400
+SHA512 (pcsc-lite-1.8.26.tar.bz2) = 23f9f41e08f6a5ff1840bec621ee37d6eb268e4ced58df516eb7e32cb6a84998a1d04bafcec36e6524926963e6730a25301301d364b6bd4dda8da1caaa76f037
+SHA512 (pcsc-lite-1.8.26.tar.bz2.asc) = c4fe4120b93b4bf86255c42e16865325e5014359ca176550133bf4e23c0f4dc692ec662813d828850a347647787d5fa730ccc9a7c3775908b2646d82baeab34c