- updated to 1.8.8

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

diff --git a/pcsc-lite.spec b/pcsc-lite.spec
index 98f3823353a36edb1a2823373e51481cf2323ead..ab782ff519c2d607414ab6f78fc5f07185f6eb88 100644 (file)
--- a/pcsc-lite.spec
+++ b/pcsc-lite.spec
@@ -9,34 +9,35 @@
 Summary:       PCSC Framework for Linux
 Summary(pl.UTF-8):     Środowisko PCSC dla Linuksa
 Name:          pcsc-lite
-Version:       1.7.0
-Release:       2
+Version:       1.8.8
+Release:       1
 License:       BSD
 Group:         Daemons
-# Source0Download: http://alioth.debian.org/project/showfiles.php?group_id=30105
-Source0:       http://alioth.debian.org/frs/download.php/3527/%{name}-%{version}.tar.bz2
-# Source0-md5: df69029ddbf62b9ae5f9307183d19a4d
+# Source0Download: https://alioth.debian.org/frs/?group_id=30105
+Source0:       https://alioth.debian.org/frs/download.php/file/3862/%{name}-%{version}.tar.bz2
+# Source0-md5: 069dc875a2ae2d85a2ebceac73252c0a
 Source1:       %{name}-pcscd.init
 Source2:       %{name}-pcscd.sysconfig
 Source3:       pcscd.upstart
+Source4:       %{name}.tmpfiles
 Patch0:                %{name}-fhs.patch
 Patch1:                %{name}-any.patch
-Patch2:                noautostart.patch
-Patch3:                debuglog-pid.patch
-Patch4:                configure-expand.patch
+Patch2:                debuglog-pid.patch
+Patch3:                configure-expand.patch
 URL:           http://www.linuxnet.com/middle.html
-BuildRequires: autoconf >= 2.58
+BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.8
 BuildRequires: flex
 %{?with_apidocs:BuildRequires: graphviz}
-%{?with_udev:BuildRequires:    udev-devel}
 BuildRequires: libtool >= 2:2.0
 %{!?with_udev:BuildRequires:   libusb-devel >= 1.0}
 BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.647
+%{?with_udev:BuildRequires:    udev-devel}
 Requires(post,preun):  /sbin/chkconfig
 Requires(pretrans):    fileutils
-Requires:      rc-scripts >= 0.4.1.26
+Requires:      rc-scripts >= 0.4.3.0
+Requires:      systemd-units >= 38
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                usbdropdir      /usr/%{_lib}/pcsc/drivers
@@ -109,7 +110,6 @@ Dokumentacja API biblioteki PC/SC Lite.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -121,6 +121,7 @@ Dokumentacja API biblioteki PC/SC Lite.
 CPPFLAGS="%{rpmcppflags} -DDISABLE_ON_DEMAND_POWER_ON"
 %configure \
        %{!?with_udev:--disable-libudev} \
+       --disable-silent-rules \
        --enable-ipcdir=/var/run/pcscd \
        --enable-static \
        --enable-usbdropdir=%{usbdropdir}
@@ -138,7 +139,8 @@ install -d $RPM_BUILD_ROOT%{usbdropdir} \
        $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,init} \
        $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d \
        $RPM_BUILD_ROOT/var/run/pcscd \
-       $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+       $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \
+       $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -147,7 +149,8 @@ install -d $RPM_BUILD_ROOT%{usbdropdir} \
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/pcscd
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/pcscd
-cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/init/pcscd
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/init/pcscd.conf
+install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 
 cp -p doc/example/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -164,12 +167,20 @@ fi
 %post
 /sbin/chkconfig --add pcscd
 %service pcscd restart "PC/SC smart card daemon"
+%systemd_post pcscd.service pcscd.socket
 
 %preun
 if [ "$1" = "0" ]; then
        %service pcscd stop
        /sbin/chkconfig --del pcscd
 fi
+%systemd_preun pcscd.service pcscd.socket
+
+%postun
+%systemd_reload
+
+%triggerpostun -- pcsc-lite < 1.8.3-1
+%systemd_trigger pcscd.service pcscd.socket
 
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
@@ -177,6 +188,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog* DRIVERS HELP NEWS README SECURITY TODO doc/README.DAEMON
+%attr(755,root,root) %{_bindir}/pcsc-spy
 %attr(755,root,root) %{_sbindir}/pcscd
 %dir %{_libdir}/pcsc
 %dir %{_libdir}/pcsc/drivers
@@ -184,19 +196,27 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/pcscd
 %config(noreplace) %verify(not md5 mtime size) /etc/init/pcscd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/pcscd
+%{_mandir}/man1/pcsc-spy.1*
 %{_mandir}/man5/reader.conf.5*
 %{_mandir}/man8/pcscd.8*
 %dir /var/run/pcscd
+%{systemdunitdir}/pcscd.service
+%{systemdunitdir}/pcscd.socket
+/usr/lib/tmpfiles.d/%{name}.conf
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpcsclite.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libpcsclite.so.1
+%attr(755,root,root) %{_libdir}/libpcscspy.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpcscspy.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpcsclite.so
+%attr(755,root,root) %{_libdir}/libpcscspy.so
 %{_libdir}/libpcsclite.la
+%{_libdir}/libpcscspy.la
 %{_includedir}/PCSC
 %{_pkgconfigdir}/libpcsclite.pc
 %{_examplesdir}/%{name}-%{version}
@@ -204,6 +224,7 @@ fi
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libpcsclite.a
+%{_libdir}/libpcscspy.a
 
 %if %{with apidocs}
 %files apidocs