From a7506d5eb081b583d50b6ae313920a03c8a812df Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 21 Apr 2019 21:19:05 +0200 Subject: [PATCH] - new URLs, updated to 1.8.25 - removed outdated fhs patch --- pcsc-lite-fhs.patch | 24 ------------------------ pcsc-lite.spec | 16 +++++++--------- 2 files changed, 7 insertions(+), 33 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 8b64582..6162564 100644 --- a/pcsc-lite.spec +++ b/pcsc-lite.spec @@ -11,21 +11,20 @@ Summary: PCSC Framework for Linux Summary(pl.UTF-8): Środowisko PCSC dla Linuksa Name: pcsc-lite -Version: 1.8.23 +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/4235/%{name}-%{version}.tar.bz2 -# Source0-md5: 3ba4b45456a500b5f1f22bf56a2dee38 +# 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 Source4: %{name}.tmpfiles -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 @@ -109,8 +108,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 @@ -192,7 +190,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.44.0