From 854751f9bdd99b86cbe5253107865f990e997088 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 15 Jul 2011 10:50:59 +0300 Subject: [PATCH] Drop pcsc-lite-1.4-docinst.patch Instead of patching the generated Makefile.in, just rm the file at the end of %install. --- pcsc-lite-1.4-docinst.patch | 11 ----------- pcsc-lite.spec | 5 +++-- 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 pcsc-lite-1.4-docinst.patch diff --git a/pcsc-lite-1.4-docinst.patch b/pcsc-lite-1.4-docinst.patch deleted file mode 100644 index e72c053..0000000 --- a/pcsc-lite-1.4-docinst.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./doc/Makefile.in.docinst 2008-06-26 20:32:52.000000000 -0700 -+++ ./doc/Makefile.in 2008-08-28 14:18:11.240452000 -0700 -@@ -612,7 +612,7 @@ - - info-am: - --install-data-am: install-docDATA install-man -+install-data-am: install-man - - install-dvi: install-dvi-recursive - diff --git a/pcsc-lite.spec b/pcsc-lite.spec index 7e597d0..ed868b4 100644 --- a/pcsc-lite.spec +++ b/pcsc-lite.spec @@ -10,7 +10,6 @@ License: BSD URL: http://pcsclite.alioth.debian.org/ Source0: http://alioth.debian.org/download.php/%{upstream_build}/%{name}-%{version}.tar.bz2 Source1: pcscd.init -Patch0: %{name}-1.4-docinst.patch # Disable pcscd on-demand startup (#653903) Patch2: %{name}-1.6.7-noautostart.patch @@ -61,7 +60,6 @@ Requires: %{name}-libs = %{version}-%{release} %prep %setup -q -%patch0 -p0 -b .docinst %patch2 -p1 -b .noautostart # Convert to utf-8 @@ -92,6 +90,9 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers rm $RPM_BUILD_ROOT%{_libdir}/*.la +# Remove documentation installed in a wrong directory +rm $RPM_BUILD_ROOT%{_docdir}/pcsc-lite/README.DAEMON + %post /sbin/chkconfig --add pcscd