- merged 2.0.1 from PLD

[packages/pcsc-lite.git] / pcsc-lite.spec

diff --git a/pcsc-lite.spec b/pcsc-lite.spec
index d3931be97d95c9324c48a11ff4d997adb1d9f08d..b10fdebceb2a09b582c28cd2b703feed3969e075 100644 (file)
--- a/pcsc-lite.spec
+++ b/pcsc-lite.spec
@@ -1,37 +1,40 @@
 # TODO
+# - follow upstream with using /run instead of /var/run
 # - pcscd & pcscd-lite-libs need to be exactly same version installed otherwise
 #   client will flood daemon so much that daemon is not usable (max 200
 #   connections reached, etc)
 #
 # Conditional build:
-%bcond_without polkit  # polkit support
-%bcond_without udev    # udev support (plain libusb if disabled)
+%bcond_without apidocs         # API documentation
+%bcond_without polkit          # polkit support
+%bcond_without static_libs     # static libraries
+%bcond_without udev            # udev support (plain libusb if disabled)
 
 Summary:       PCSC Framework for Linux
 Summary(pl.UTF-8):     Środowisko PCSC dla Linuksa
 Name:          pcsc-lite
-Version:       1.8.11
-Release:       4
+Version:       2.0.1
+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
+Source0:       https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2
+# Source0-md5: 730d069764c769ba3bac391a96c8a54f
 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: autoconf-archive
 BuildRequires: automake >= 1:1.8
 BuildRequires: flex
-%{?with_apidocs:BuildRequires: graphviz}
+%{?with_apidocs:BuildRequires: doxygen}
 BuildRequires: libtool >= 2:2.0
 %{!?with_udev:BuildRequires:   libusb-devel >= 1.0}
+BuildRequires: perl-tools-pod
 BuildRequires: pkgconfig
 %{?with_polkit:BuildRequires:  polkit-devel >= 0.111}
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.647
 %{?with_udev:BuildRequires:    udev-devel}
 Requires(post,preun):  /sbin/chkconfig
@@ -97,6 +100,7 @@ Statyczne biblioteki PC/SC Lite.
 Summary:       PC/SC Lite API documentation
 Summary(pl.UTF-8):     Dokumentacja API biblioteki PC/SC Lite
 Group:         Documentation
+BuildArch:     noarch
 
 %description apidocs
 API and internal documentation for PC/SC Lite library.
@@ -106,10 +110,10 @@ Dokumentacja API biblioteki PC/SC Lite.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+
+%{__sed} -i -e '1s, /usr/bin/python$,%{__python3},' src/spy/pcsc-spy
 
 %build
 %{__libtoolize}
@@ -120,11 +124,12 @@ 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 \
-       %{?with_polkit:--enable-polkit} \
-       --enable-static \
+       %{__enable_disable polkit} \
+       %{__enable_disable static_libs static} \
        --enable-usbdropdir=%{usbdropdir}
 
 %{__make}
@@ -137,7 +142,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 +182,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.polkit
 %attr(755,root,root) %{_bindir}/pcsc-spy
 %attr(755,root,root) %{_sbindir}/pcscd
 %dir %{_libdir}/pcsc
@@ -210,10 +215,12 @@ fi
 %{_pkgconfigdir}/libpcsclite.pc
 %{_examplesdir}/%{name}-%{version}
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libpcsclite.a
 %{_libdir}/libpcscspy.a
+%endif
 
 %if %{with apidocs}
 %files apidocs