diff --git a/pcsc-lite-lsb_header.patch b/pcsc-lite-lsb_header.patch index 55ec951..3ebbe3b 100644 --- a/pcsc-lite-lsb_header.patch +++ b/pcsc-lite-lsb_header.patch @@ -1,13 +1,27 @@ ---- pcsc-lite-1.5.5/etc/pcscd.init.in.lsb_header 2010-03-03 17:37:19.000000000 +0200 -+++ pcsc-lite-1.5.5/etc/pcscd.init.in 2010-03-03 17:38:09.000000000 +0200 -@@ -15,8 +15,8 @@ +diff -up pcsc-lite-1.5.5/etc/pcscd.init.in.lsb_header pcsc-lite-1.5.5/etc/pcscd.init.in +--- pcsc-lite-1.5.5/etc/pcscd.init.in.lsb_header 2008-05-09 17:59:08.000000000 +0300 ++++ pcsc-lite-1.5.5/etc/pcscd.init.in 2010-04-13 12:56:33.000000000 +0300 +@@ -2,7 +2,7 @@ + # + # pcscd Starts the pcscd Daemon + # +-# chkconfig: 2345 25 88 ++# chkconfig: 2345 27 73 + # description: The PC/SC smart card daemon is a resource manager for the \ + # PC/SC lite and Musclecard frameworks. It coordinates \ + # communications with smart card readers, smart cards, and \ +@@ -13,10 +13,10 @@ + # + ### BEGIN INIT INFO # Provides: pcscd - # Required-Start: $local_fs $remote_fs $syslog - # Required-Stop: $local_fs $remote_fs $syslog +-# Required-Start: $local_fs $remote_fs $syslog +-# Required-Stop: $local_fs $remote_fs $syslog -# Should-Start: udev hal openct -# Should-Stop: udev hal openct -+# Should-Start: udev-post haldaemon openct -+# Should-Stop: udev-post haldaemon openct ++# Required-Start: $local_fs $remote_fs $syslog haldaemon ++# Required-Stop: $local_fs $remote_fs $syslog haldaemon ++# Should-Start: openct ++# Should-Stop: openct # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Daemon to access a smart card using PC/SC diff --git a/pcsc-lite.spec b/pcsc-lite.spec index a9420f4..b0ce73a 100644 --- a/pcsc-lite.spec +++ b/pcsc-lite.spec @@ -2,7 +2,7 @@ Name: pcsc-lite Version: 1.5.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: PC/SC Lite smart card framework and applications Group: System Environment/Daemons @@ -12,7 +12,7 @@ Source0: http://alioth.debian.org/download.php/%{upstream_build}/%{name}- Patch0: %{name}-1.4-docinst.patch Patch1: %{name}-1.5.5-rpath64.patch Patch2: %{name}-close_on_exec.patch -# Fix init script LSB header to reference Fedora specific service names +# Fedora specific changes to init script LSB header and start/stop priorities Patch3: %{name}-lsb_header.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,7 +47,6 @@ PC/SC Lite libraries. Summary: PC/SC Lite development files Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} -Requires: pkgconfig %description devel PC/SC Lite development files. @@ -151,6 +150,10 @@ fi %changelog +* Tue Apr 13 2010 Kalev Lember - 1.5.5-4 +- Fix init script start / stop priorities (#580322) +- Don't require pkgconfig as the dep is now automatically generated by rpm + * Wed Mar 03 2010 Kalev Lember - 1.5.5-3 - Added patch to fix init script LSB header (#565241) - Dropped BR: libusb-devel as configure script really picks up libhal instead