[roundup] fix duplicate documentation (#1001236) - drop CFLAGS definition (since this is a noarch Python packa

Michael Schwendt mschwendt at fedoraproject.org
Thu Dec 12 22:43:52 UTC 2013


commit ac39de26a0f3ed3c6ad98b6d7578369e4f5f8e4e
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Thu Dec 12 23:43:56 2013 +0100

    fix duplicate documentation (#1001236)
    - drop CFLAGS definition (since this is a noarch Python package)
    - drop %defattr
    - fix %{?dist} usage

 roundup.spec |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/roundup.spec b/roundup.spec
index 3b223b0..2b61691 100644
--- a/roundup.spec
+++ b/roundup.spec
@@ -3,7 +3,7 @@
 Summary: Simple and flexible issue-tracking system
 Name: roundup
 Version: 1.4.21
-Release: 2%{dist}
+Release: 3%{?dist}
 License: MIT
 Group: Applications/Engineering
 Source: http://pypi.python.org/packages/source/r/%{name}/%{name}-%{version}.tar.gz
@@ -27,7 +27,8 @@ Yee in the Software Carpentry "Track" design competition.
 %package doc
 Group: Documentation
 Summary: Documentation for the Roundup
-Requires: %{name} = %{version}-%{release}
+# documentation does not need the base package to be installed
+#Requires: %{name} = %{version}-%{release}
 BuildArch: noarch
 
 %description doc
@@ -44,13 +45,17 @@ rm -f locale/ru-koi8.po
 install -pm 644 %{SOURCE3} .
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+%{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --root $RPM_BUILD_ROOT
 install -p -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/roundup.conf
 install -p -D -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/roundup
+# move installed docs for %%doc usage in -doc subpackage
+rm -rf __tmp_doc ; mkdir __tmp_doc
+mv ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}/* __tmp_doc
+
 %find_lang %{name}
 
 %post
@@ -81,16 +86,21 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 %{_datadir}/roundup/
 %{_mandir}/man1/*
-%defattr(-,root,root)
 %config(noreplace) %{_initrddir}/roundup
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %doc README.Fedora COPYING.txt
 
 %files doc
-%doc %{_defaultdocdir}/%{name}/*
+%doc __tmp_doc/*
 
 %changelog
+* Thu Dec 12 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 1.4.21-3
+- fix duplicate documentation (#1001236)
+- drop CFLAGS definition (since this is a noarch Python package)
+- drop %%defattr
+- fix %%{?dist} usage
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -185,12 +195,12 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Sep 17 2005 W. Michael Petullo <mike[@]flyn.org> - 0.8.4-6
    - Fix installation of Python modules on x86_64.
 
-* Sun Sep 05 2005 W. Michael Petullo <mike[@]flyn.org> - 0.8.4-5
+* Mon Sep 05 2005 W. Michael Petullo <mike[@]flyn.org> - 0.8.4-5
    - No longer use setup.py's --record feature.
    - Really fix init script.
    - %{_mandir}/man1/* instead of %{_mandir}/*.
 
-* Sun Sep 05 2005 W. Michael Petullo <mike[@]flyn.org> - 0.8.4-4
+* Mon Sep 05 2005 W. Michael Petullo <mike[@]flyn.org> - 0.8.4-4
    - Put man pages in /usr/share/man.
    - Use a shorter summary.
    - Do not enable service by default.


More information about the scm-commits mailing list