[comedilib] - Fix duplicate documentation (#1001241) by not using %doc magic - Remove INSTALL instructions file

Michael Schwendt mschwendt at fedoraproject.org
Sat Dec 14 13:01:48 UTC 2013


commit dbc0aaaeaef46f5c99a6a00472dc721e4ca5976b
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sat Dec 14 14:01:50 2013 +0100

    - Fix duplicate documentation (#1001241) by not using %doc magic
    - Remove INSTALL instructions file
    - Move _comedi.so Python module into base package
    - chmod -x comedi.py Python module
    - Don't exclude .pyc/.pyo files
    - Remove %defattr
    - Add %?_isa to base package dep
    
    [Fix bogus dates in %changelog]

 comedilib.spec |   42 ++++++++++++++++++++++++++++++------------
 1 files changed, 30 insertions(+), 12 deletions(-)
---
diff --git a/comedilib.spec b/comedilib.spec
index 67d121d..82b26ee 100644
--- a/comedilib.spec
+++ b/comedilib.spec
@@ -2,7 +2,7 @@
 
 Name:		comedilib
 Version:	0.8.1
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	Data Acquisition library for the Comedi driver
 License:	LGPLv2
 Group:		System Environment/Kernel
@@ -26,8 +26,11 @@ and demonstration programs.
 %package devel
 Summary:	Libraries/include files for Comedi
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
+# pkgconfig deps are automatic in Fedora and EL>=6
+%if 0%{?rhel} == 5
 Requires:	pkgconfig
+%endif
 
 %description devel
 Comedilib is a library for using Comedi, a driver interface for data
@@ -47,9 +50,16 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install 
+chmod -x ${RPM_BUILD_ROOT}%{python_sitearch}/comedi.py
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT%{python_sitearch}/_comedi.la
 
+# adding to installed docs in order to avoid using %%doc magic
+for f in AUTHORS COPYING README ; do
+    cp -p $f ${RPM_BUILD_ROOT}%{_docdir}/%{name}/${f}
+done
+
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -58,29 +68,37 @@ rm -rf $RPM_BUILD_ROOT%{python_sitearch}/_comedi.la
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING INSTALL README
 %{_bindir}/comedi_*
 %{_sbindir}/comedi_*
 %{_sysconfdir}/pcmcia/comedi
 %config(noreplace)%{_sysconfdir}/pcmcia/comedi.*
 %{_libdir}/libcomedi.so.*
-%{python_sitearch}/comedi*
-%exclude %{python_sitearch}/*.pyc
-%exclude %{python_sitearch}/*.pyo
+%{python_sitearch}/*
 %{_mandir}/man7/*
 %{_mandir}/man8/*
+%dir %{_docdir}/%{name}
+%{_docdir}/%{name}/AUTHORS
+%{_docdir}/%{name}/COPYING
+%{_docdir}/%{name}/README
+%{_docdir}/%{name}/*.conf
 
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/libcomedi.so
 %{_libdir}/pkgconfig/*
-%{python_sitearch}/_comedi.so
 %{_includedir}/comedi*
-%{_datadir}/doc/%{name}/
 %{_mandir}/man3/*
+%{_docdir}/%{name}/html/
 
 %changelog
+* Sat Dec 14 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 0.8.1-13
+- Fix duplicate documentation (#1001241) by not using %%doc magic
+- Remove INSTALL instructions file
+- Move _comedi.so Python module into base package
+- chmod -x comedi.py Python module
+- Don't exclude .pyc/.pyo files
+- Remove %%defattr
+- Add %%?_isa to base package dep
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -119,9 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 - Spec file rewrite
 - Upstream release
 
-* Tue Jun 03 2002 David Schleef <ds at schleef.org>
+* Mon Jun 03 2002 David Schleef <ds at schleef.org>
 - update for new build system
 
-* Wed Feb 21 2002 Tim Ousley <tim.ousley at ni.com>
+* Thu Feb 21 2002 Tim Ousley <tim.ousley at ni.com>
 - initial build of comedilib RPM
 


More information about the scm-commits mailing list