[packages/pcsc-lite] - updated to 2.5.0, uses meson now

qboosh qboosh at pld-linux.org
Sun Jun 7 21:50:56 CEST 2026 

commit c5004aa8cc6a6e402dbfb0769a44ab16ef9322a7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jun 7 21:51:10 2026 +0200

    - updated to 2.5.0, uses meson now

 pcsc-lite-any.patch | 12 +++++-----
 pcsc-lite.spec      | 66 +++++++++++++++++++++++------------------------------
 2 files changed, 34 insertions(+), 44 deletions(-)
---
diff --git a/pcsc-lite.spec b/pcsc-lite.spec
index 502a873..aeefae5 100644
--- a/pcsc-lite.spec
+++ b/pcsc-lite.spec
@@ -14,30 +14,28 @@
 Summary:	PCSC Framework for Linux
 Summary(pl.UTF-8):	Środowisko PCSC dla Linuksa
 Name:		pcsc-lite
-Version:	2.4.1
-Release:	2
+Version:	2.5.0
+Release:	1
 License:	BSD
 Group:		Daemons
 Source0:	https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.xz
-# Source0-md5:	fd6349f53039308027413e6e8a1a8a1f
+# Source0-md5:	d452145c4e89cf56cef512597395b501
 Source1:	%{name}-pcscd.init
 Source2:	%{name}-pcscd.sysconfig
 Source4:	%{name}.tmpfiles
 Patch0:		%{name}-any.patch
 Patch1:		debuglog-pid.patch
 URL:		https://pcsclite.apdu.fr/
-BuildRequires:	autoconf >= 2.69
-BuildRequires:	autoconf-archive
-BuildRequires:	automake >= 1:1.8
 %{?with_apidocs:BuildRequires:	doxygen}
 BuildRequires:	flex
-BuildRequires:	libtool >= 2:2.0
 %{!?with_udev:BuildRequires:	libusb-devel >= 1.0}
+BuildRequires:	meson >= 0.58.0
+BuildRequires:	ninja >= 1.5
 BuildRequires:	perl-tools-pod
 BuildRequires:	pkgconfig
 %{?with_polkit:BuildRequires:	polkit-devel >= 0.111}
 BuildRequires:	rpm-build >= 4.6
-BuildRequires:	rpmbuild(macros) >= 1.647
+BuildRequires:	rpmbuild(macros) >= 2.042
 %{?with_systemd:BuildRequires:	systemd-devel}
 BuildRequires:	tar >= 1:1.22
 %{?with_udev:BuildRequires:	udev-devel}
@@ -131,27 +129,24 @@ Dokumentacja API biblioteki PC/SC Lite.
 %{__sed} -i -e '1s, /usr/bin/python$,%{__python3},' src/spy/pcsc-spy
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
 # auto power down unreliable yet
 CPPFLAGS="%{rpmcppflags} -DDISABLE_ON_DEMAND_POWER_ON"
-%configure \
-	%{!?with_systemd:--disable-libsystemd} \
-	%{!?with_udev:--disable-libudev} \
-	--disable-silent-rules \
-	--enable-ipcdir=/var/run/pcscd \
-	%{__enable_disable polkit} \
-	%{__enable_disable static_libs static} \
-	--enable-usbdropdir=%{usbdropdir}
-
-%{__make}
+%meson \
+	-Dipcdir=/var/run/pcscd \
+	-Dlibsystemd=%{__true_false systemd} \
+	-Dlibudev=%{__true_false udev} \
+	%{!?with_udev:-Dlibusb=true} \
+	-Dpolkit=%{__true_false polkit} \
+	-Dserial=true \
+	-Dsystemdunit=system \
+	-Dusb=true \
+	-Dusbdropdir=%{usbdropdir}
+
+%meson_build
 
 %if %{with apidocs}
-doxygen doc/doxygen.conf
-rm -f doc/api/*.{map,md5}
+cd build
+doxygen doxygen.conf
 %endif
 
 %install
@@ -163,8 +158,7 @@ install -d $RPM_BUILD_ROOT%{usbdropdir} \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \
 	$RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+%meson_install
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
@@ -223,14 +217,17 @@ fi
 %dir %{_sysconfdir}/reader.conf.d
 %attr(754,root,root) /etc/rc.d/init.d/pcscd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/pcscd
+%{_datadir}/metainfo/fr.apdu.pcsclite.metainfo.xml
 %{_mandir}/man1/pcsc-spy.1*
 %{_mandir}/man5/reader.conf.5*
 %{_mandir}/man8/pcscd.8*
 %dir /var/run/pcscd
 %if %{with systemd}
+%config(noreplace) %verify(not md5 mtime size) /etc/default/pcscd
 %{systemdunitdir}/pcscd.service
 %{systemdunitdir}/pcscd.socket
 %endif
+%{_sysusersdir}/pcscd-sysusers.conf
 %{systemdtmpfilesdir}/pcsc-lite.conf
 %if %{with polkit}
 %{_datadir}/polkit-1/actions/org.debian.pcsc-lite.policy
@@ -238,21 +235,15 @@ fi
 
 %files libs
 %defattr(644,root,root,755)
-%{_libdir}/libpcsclite.so.*.*.*
-%ghost %{_libdir}/libpcsclite.so.1
-%{_libdir}/libpcsclite_real.so.*.*.*
-%ghost %{_libdir}/libpcsclite_real.so.1
-%{_libdir}/libpcscspy.so.*.*.*
-%ghost %{_libdir}/libpcscspy.so.0
+%{_libdir}/libpcsclite.so.1
+%{_libdir}/libpcsclite_real.so.1
+%{_libdir}/libpcscspy.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %{_libdir}/libpcsclite.so
 %{_libdir}/libpcsclite_real.so
 %{_libdir}/libpcscspy.so
-%{_libdir}/libpcsclite.la
-%{_libdir}/libpcsclite_real.la
-%{_libdir}/libpcscspy.la
 %{_includedir}/PCSC
 %{_pkgconfigdir}/libpcsclite.pc
 %{_examplesdir}/%{name}-%{version}
@@ -261,12 +252,11 @@ fi
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libpcsclite.a
-%{_libdir}/libpcsclite_real.a
 %{_libdir}/libpcscspy.a
 %endif
 
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%doc doc/api/*
+%doc build/doc/api/*
 %endif
diff --git a/pcsc-lite-any.patch b/pcsc-lite-any.patch
index e1acd3c..85212d2 100644
--- a/pcsc-lite-any.patch
+++ b/pcsc-lite-any.patch
@@ -1,6 +1,6 @@
---- pcsc-lite-1.5.2/src/winscard.c.orig	2009-02-06 09:46:20.000000000 +0100
-+++ pcsc-lite-1.5.2/src/winscard.c	2009-04-02 22:54:43.137718835 +0200
-@@ -430,6 +430,12 @@
+--- pcsc-lite-2.5.0/src/winscard.c.orig	2026-05-27 14:39:48.000000000 +0200
++++ pcsc-lite-2.5.0/src/winscard.c	2026-06-07 19:48:38.070569555 +0200
+@@ -408,6 +408,12 @@ LONG SCardConnect(/*@unused@*/ SCARDCONT
  			{
  				(void)pthread_mutex_unlock(rContext->mMutex);
  
@@ -10,10 +10,10 @@
 +				if (dwPreferredProtocols & SCARD_PROTOCOL_ANY_OLD)
 +					dwPreferredProtocols = SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1;
 +
- 				if (! (dwPreferredProtocols & rContext->readerState->cardProtocol))
+ 				if (! (dwPreferredProtocols & rContext->readerState.cardProtocol))
  				{
  					rv = SCARD_E_PROTO_MISMATCH;
-@@ -758,6 +764,12 @@
+@@ -708,6 +714,12 @@ LONG SCardReconnect(SCARDHANDLE hCard, D
  			{
  				(void)pthread_mutex_unlock(rContext->mMutex);
  
@@ -23,6 +23,6 @@
 +				if (dwPreferredProtocols & SCARD_PROTOCOL_ANY_OLD)
 +					dwPreferredProtocols = SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1;
 +
- 				if (! (dwPreferredProtocols & rContext->readerState->cardProtocol))
+ 				if (! (dwPreferredProtocols & rContext->readerState.cardProtocol))
  				{
  					rv = SCARD_E_PROTO_MISMATCH;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pcsc-lite.git/commitdiff/c5004aa8cc6a6e402dbfb0769a44ab16ef9322a7

More information about the pld-cvs-commit mailing list