[pcsc-lite] Cleaned up the spec file for modern rpmbuild

Kalev Lember kalev at fedoraproject.org
Wed Jun 22 08:54:09 UTC 2011


commit 99341b798eef88721180d5a1bce5adcc676c020e
Author: Kalev Lember <kalev at smartlink.ee>
Date:   Wed Jun 22 11:50:12 2011 +0300

    Cleaned up the spec file for modern rpmbuild

 pcsc-lite.spec |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)
---
diff --git a/pcsc-lite.spec b/pcsc-lite.spec
index 63595d6..eb38fd0 100644
--- a/pcsc-lite.spec
+++ b/pcsc-lite.spec
@@ -13,7 +13,6 @@ Source1:        pcscd.init
 Patch0:         %{name}-1.4-docinst.patch
 # Disable pcscd on-demand startup (#653903)
 Patch2:         %{name}-1.6.7-noautostart.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libudev-devel
 BuildRequires:  doxygen
@@ -83,7 +82,6 @@ doxygen doc/doxygen.conf ; rm -f doc/api/*.{map,md5}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/pcscd
@@ -95,10 +93,6 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post
 /sbin/chkconfig --add pcscd
 
@@ -119,7 +113,6 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog* DRIVERS HELP README SECURITY TODO
 %dir %{_sysconfdir}/reader.conf.d/
 %{_initrddir}/pcscd
@@ -130,18 +123,15 @@ fi
 %{_mandir}/man8/pcscd.8*
 
 %files libs
-%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/libpcsclite.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/PCSC/
 %{_libdir}/libpcsclite.so
 %{_libdir}/pkgconfig/libpcsclite.pc
 
 %files doc
-%defattr(-,root,root,-)
 %doc doc/api/ doc/example/pcsc_demo.c
 
 
@@ -150,6 +140,7 @@ fi
 - Update to 1.7.3
 - Dropped upstreamed patches
 - Dropped the lib64 rpath patch; pcsc-lite now uses system libtool
+- Cleaned up the spec file for modern rpmbuild
 
 * Wed May 25 2011 Kalev Lember <kalev at smartlink.ee> - 1.7.2-2
 - Don't fill log files with repeating messages (#657658, #707412)


More information about the scm-commits mailing list