diff --git a/pcsc-lite-lsb_header.patch b/pcsc-lite-lsb_header.patch new file mode 100644 index 0000000..55ec951 --- /dev/null +++ b/pcsc-lite-lsb_header.patch @@ -0,0 +1,13 @@ +--- 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 @@ + # Provides: pcscd + # 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 + # 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 e7e9fec..a9420f4 100644 --- a/pcsc-lite.spec +++ b/pcsc-lite.spec @@ -1,8 +1,9 @@ +%global upstream_build 3082 + Name: pcsc-lite Version: 1.5.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PC/SC Lite smart card framework and applications -%define upstream_build 3082 Group: System Environment/Daemons License: BSD @@ -11,10 +12,11 @@ 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 +Patch3: %{name}-lsb_header.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libusb-devel BuildRequires: hal-devel BuildRequires: doxygen Requires(post): initscripts @@ -64,6 +66,7 @@ BuildArch: noarch %patch0 -p0 -b .docinst %patch1 -p1 -b .rpath64 %patch2 -p1 -b .close_on_exec +%patch3 -p1 -b .lsb_header %build %configure \ @@ -148,6 +151,11 @@ fi %changelog +* 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 +- Use %%global instead of %%define + * Mon Dec 21 2009 Kalev Lember - 1.5.5-2 - Require -libs subpackage from main pcsc-lite package - Build -doc subpackage as noarch