Accepting request 231044 from home:wrosenauer:devel

OBS-URL: https://build.opensuse.org/request/show/231044
OBS-URL: https://build.opensuse.org/package/show/security:chipcard/pcsc-lite?expand=0&rev=96

pcsc-lite.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package pcsc-lite
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,6 +21,7 @@ Name:           pcsc-lite
 %define ifddir %{_libdir}/readers
 BuildRequires:  libtool
 BuildRequires:  pkg-config
+BuildRequires:  polkit-devel
 BuildRequires:  readline-devel
 %if %suse_version >= 1120
 BuildRequires:  libudev-devel
@@ -36,7 +37,7 @@ BuildRequires:  systemd
 %if %suse_version > 1220
 BuildRequires:  gpg-offline
 %endif
-Version:        1.8.10
+Version:        1.8.11
 Release:        0
 Requires(pre):  pwdutils
 Url:            http://pcsclite.alioth.debian.org/
@@ -53,9 +54,10 @@ Source6:        pcsc-lite-reader-conf
 Source7:        %{name}-%{version}.tar.bz2.asc
 Source8:        %{name}.keyring
 Patch0:         systemd-service.patch
-Requires(post): %insserv_prereq %fillup_prereq
-%if %suse_version > 1130
+Requires(post): %fillup_prereq
+%if %suse_version < 1310
 PreReq:         sysvinit(syslog)
+Requires(post): %insserv_prereq
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define USER	scard
@@ -155,8 +157,12 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/
 sed s:@ifddir@:%{ifddir}: <pcsc-lite-reader-conf >$RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/reader.conf
 # this program is noinst in the package
 #install src/.libs/testpcsc $RPM_BUILD_ROOT%{_sbindir}/
+%if %suse_version < 1310
 install -D -m 755 pcsc-lite-init $RPM_BUILD_ROOT%{_initrddir}/pcscd
 ln -sf %{_initrddir}/pcscd $RPM_BUILD_ROOT%{_sbindir}/rcpcscd
+%else
+ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcpcscd
+%endif
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 cp %{name}.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.pcscd
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -186,13 +192,19 @@ exit 0
 /bin/systemctl try-restart pcscd.service || :
 /bin/systemctl restart pcscd.socket || :
 %endif
+%if %suse_version < 1310
 %fillup_and_insserv -y -n pcscd pcscd
+%else
+%fillup_only pcscd
+%endif
 
 %preun
 %if %suse_version > 1140
 %service_del_preun pcscd.service pcscd.socket
 %endif
+%if %suse_version < 1310
 %stop_on_removal pcscd
+%endif
 
 %postun
 %if %suse_version > 1140
@@ -202,8 +214,10 @@ if [ "$1" = "1" ]; then
   /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
 %endif
+%if %suse_version < 1310
 %restart_on_update pcscd
 %insserv_cleanup
+%endif
 
 %post -n libpcsclite1 -p /sbin/ldconfig
 
@@ -225,6 +239,7 @@ fi
 %{_docdir}/%{name}/README
 %{_docdir}/%{name}/README.DAEMON
 %{_docdir}/%{name}/README.SUSE
+%{_docdir}/%{name}/README.polkit
 %{_docdir}/%{name}/SECURITY
 %{_docdir}/%{name}/TODO
 %doc %{_mandir}/man?/*.*
@@ -235,10 +250,13 @@ fi
 %if %suse_version > 1140
 %_unitdir/*
 %endif
+%if %suse_version < 1310
 %{_initrddir}/pcscd
+%endif
 /var/adm/fillup-templates/sysconfig.pcscd
 # libpcsclite.so should stay in the main package (#732911). Third party packages may need it for dlopen().
 %{_libdir}/libpcsclite.so
+#%{_datadir}/polkit-1/actions/org.debian.pcsc-lite.policy
 
 %files -n libpcsclite1
 %defattr(-,root,root)