From ef4e424d76ac58e100b90e700c57713b6ecf9f51 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Sat, 24 Aug 2019 20:05:36 +0200
Subject: [PATCH] - merged 1.8.25 from PLD

---
 pcsc-lite-fhs.patch | 24 ------------------------
 pcsc-lite.spec      | 23 ++++++++++++-----------
 2 files changed, 12 insertions(+), 35 deletions(-)
 delete mode 100644 pcsc-lite-fhs.patch

diff --git a/pcsc-lite-fhs.patch b/pcsc-lite-fhs.patch
deleted file mode 100644
index 8550382..0000000
--- a/pcsc-lite-fhs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- pcsc-lite-1.8.11/DRIVERS.orig	2014-03-07 21:54:54.054804707 +0100
-+++ pcsc-lite-1.8.11/DRIVERS	2014-03-07 21:59:19.138126916 +0100
-@@ -3,17 +3,17 @@
- To install USB drivers, download the driver from
- http://musclecard.com/software.html and copy it to a temporary location.
- After you have unarchived the files copy the directory to
--/usr/local/pcsc/drivers/.  If the directory /usr/local/pcsc/drivers/
-+/usr/lib*/pcsc/drivers/.  If the directory /usr/lib*/pcsc/drivers/
- does not exist create it before copying the driver directory to it.
- 
- Example Mac OS X, Linux 2.4:
- 
- tar -xzvf driver.bundle-0.1.0.tar.gz
--cp -r driver.bundle /usr/local/pcsc/drivers/
--cd /usr/local/pcsc/drivers/driver.bundle
-+cp -r driver.bundle /usr/lib*/pcsc/drivers/
-+cd /usr/lib*/pcsc/drivers/driver.bundle
- build or use Project Builder to build
- 
--The /usr/local/pcsc/drivers/ directory should contain bundle directories only.
-+The /usr/lib*/pcsc/drivers/ directory should contain bundle directories only.
- You must restart pcscd to use the new driver.
- 
- 
diff --git a/pcsc-lite.spec b/pcsc-lite.spec
index d3931be..92018b7 100644
--- a/pcsc-lite.spec
+++ b/pcsc-lite.spec
@@ -10,20 +10,21 @@
 Summary:	PCSC Framework for Linux
 Summary(pl.UTF-8):	Środowisko PCSC dla Linuksa
 Name:		pcsc-lite
-Version:	1.8.11
-Release:	4
+Version:	1.8.25
+Release:	1
 License:	BSD
 Group:		Daemons
-# Source0Download: https://alioth.debian.org/frs/?group_id=30105
-Source0:	https://alioth.debian.org/frs/download.php/file/3991/%{name}-%{version}.tar.bz2
-# Source0-md5:	73502ca4ba6526727f9f49c63d805408
+# TODO: switch to release tarballs
+#Source0:	https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2
+# Source0Download: https://salsa.debian.org/rousseau/PCSC/tags
+Source0:	https://salsa.debian.org/rousseau/PCSC/-/archive/pcsc-%{version}/PCSC-pcsc-%{version}.tar.bz2
+# Source0-md5:	d104b1c779c15c1da28294095ae0014e
 Source1:	%{name}-pcscd.init
 Source2:	%{name}-pcscd.sysconfig
-Patch0:		%{name}-fhs.patch
 Patch1:		%{name}-any.patch
 Patch2:		debuglog-pid.patch
 Patch3:		configure-expand.patch
-URL:		https://alioth.debian.org/projects/pcsclite/
+URL:		https://pcsclite.apdu.fr/
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake >= 1:1.8
 BuildRequires:	flex
@@ -105,8 +106,7 @@ API and internal documentation for PC/SC Lite library.
 Dokumentacja API biblioteki PC/SC Lite.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n PCSC-pcsc-%{version}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -120,6 +120,7 @@ Dokumentacja API biblioteki PC/SC Lite.
 # auto power down unreliable yet
 CPPFLAGS="%{rpmcppflags} -DDISABLE_ON_DEMAND_POWER_ON"
 %configure \
+	--disable-libsystemd \
 	%{!?with_udev:--disable-libudev} \
 	--disable-silent-rules \
 	--enable-ipcdir=/var/run/pcscd \
@@ -137,7 +138,7 @@ rm -f doc/api/*.{map,md5}
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{usbdropdir} \
-	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,init} \
+	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d \
 	$RPM_BUILD_ROOT/var/run/pcscd \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -177,7 +178,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog* DRIVERS HELP NEWS README SECURITY TODO doc/README.{DAEMON,polkit}
+%doc AUTHORS COPYING ChangeLog HELP README SECURITY TODO doc/README.{DAEMON,polkit}
 %attr(755,root,root) %{_bindir}/pcsc-spy
 %attr(755,root,root) %{_sbindir}/pcscd
 %dir %{_libdir}/pcsc
-- 
2.37.3