From 22e7fa6214f4b3cb5e284b647e0bf28f4f50bd17 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalev@fedoraproject.org>
Date: Mon, 21 Dec 2009 20:25:29 +0000
Subject: [PATCH] - Require -libs subpackage from main pcsc-lite package -
 Build -doc subpackage as noarch - Dropped --enable-runpid configure option
 which was removed in 1.4.99 - Dropped obsolete provides - Spec file cleanup

---
 pcsc-lite.spec | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pcsc-lite.spec b/pcsc-lite.spec
index b48169f..e7e9fec 100644
--- a/pcsc-lite.spec
+++ b/pcsc-lite.spec
@@ -1,6 +1,6 @@
 Name:           pcsc-lite
 Version:        1.5.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PC/SC Lite smart card framework and applications
 %define upstream_build 3082
 
@@ -14,7 +14,7 @@ Patch2:         %{name}-close_on_exec.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libusb-devel >= 0.1.7
+BuildRequires:  libusb-devel
 BuildRequires:  hal-devel 
 BuildRequires:  doxygen
 Requires(post): initscripts
@@ -23,6 +23,7 @@ Requires(preun): /sbin/chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
 Requires:       pcsc-ifd-handler
+Requires:       %{name}-libs = %{version}-%{release}
 
 %description
 The purpose of PC/SC Lite is to provide a Windows(R) SCard interface
@@ -36,7 +37,6 @@ line tools.
 %package        libs
 Summary:        PC/SC Lite libraries
 Group:          System Environment/Libraries
-Provides:       libpcsc-lite = %{version}-%{release}
 
 %description    libs
 PC/SC Lite libraries.
@@ -46,7 +46,6 @@ Summary:        PC/SC Lite development files
 Group:          Development/Libraries
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       pkgconfig
-Provides:       libpcsc-lite-devel = %{version}-%{release}
 
 %description    devel
 PC/SC Lite development files.
@@ -54,6 +53,7 @@ PC/SC Lite development files.
 %package        doc
 Summary:        PC/SC Lite developer documentation
 Group:          Documentation
+BuildArch:      noarch
 
 %description    doc
 %{summary}.
@@ -69,7 +69,6 @@ Group:          Documentation
 %configure \
   --disable-dependency-tracking \
   --disable-static \
-  --enable-runpid=%{_localstatedir}/run/pcscd.pid \
   --enable-confdir=%{_sysconfdir} \
   --enable-ipcdir=%{_localstatedir}/run \
   --enable-usbdropdir=%{_libdir}/pcsc/drivers
@@ -90,11 +89,10 @@ All *.conf files in this directory are merged into %{_sysconfdir}/reader.conf
 by %{_sbindir}/update-reader.conf.
 EOF
 
-rm $RPM_BUILD_ROOT{%{_sysconfdir}/reader.conf.d/reader.conf,%{_libdir}/lib*.la}
-touch $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
-# formaticc doesn't exist any more, don't include the man page
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/formaticc.1*
+rm $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/reader.conf
+touch $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf
 
 
 %clean
@@ -150,6 +148,13 @@ fi
 
 
 %changelog
+* Mon Dec 21 2009 Kalev Lember <kalev@smartlink.ee> - 1.5.5-2
+- Require -libs subpackage from main pcsc-lite package
+- Build -doc subpackage as noarch
+- Dropped --enable-runpid configure option which was removed in 1.4.99
+- Dropped obsolete provides
+- Spec file cleanup
+
 * Wed Nov 18 2009 Kalev Lember <kalev@smartlink.ee> - 1.5.5-1
 - Updated to pcsc-lite 1.5.5
 - Rebased rpath64 patch