[python-django-tastypie] Fix unversioned docdir issue (rhbz#1001252).

Bohuslav Kabrda bkabrda at fedoraproject.org
Tue Aug 27 08:10:21 UTC 2013


commit 0be420596f63f316015a05dbc90781fd4ed8212e
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Tue Aug 27 10:10:02 2013 +0200

    Fix unversioned docdir issue (rhbz#1001252).
    
    - Fix bogus changelog entry.

 python-django-tastypie.spec |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/python-django-tastypie.spec b/python-django-tastypie.spec
index 8b79f09..0255943 100644
--- a/python-django-tastypie.spec
+++ b/python-django-tastypie.spec
@@ -1,7 +1,7 @@
 %global pypi_name django-tastypie
 Name:           python-%{pypi_name}
 Version:        0.9.14
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A flexible and capable API layer for Django
 
 Group:          Development/Languages
@@ -18,8 +18,6 @@ Source1:        https://github.com/toastdriven/%{pypi_name}/archive/%{commit}/%{
 # Patch so this works with Django 1.5
 Patch0:         %{name}-django-1.5.patch
 
-%global docdir %{_docdir}/%{name}
-
 BuildArch:      noarch
 # Let's keep Requires and BuildRequires sorted alphabetically
 BuildRequires:  python2-devel
@@ -82,6 +80,7 @@ This package contains documentation for %{name}.
 cp -r ../%{pypi_name}-%{commit}/tests .
 # (re)generate the documentation
 sphinx-build docs docs/_build/html
+rm -rf docs/_build/html/.??*
 
 # if on RHEL, using dateutils15, we need to alter __init__.py to load them properly
 %if 0%{?rhel}
@@ -96,9 +95,6 @@ EOF
 
 %install
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{docdir}
-cp -p LICENSE README.rst AUTHORS -t $RPM_BUILD_ROOT%{docdir}
-cp -pr docs/_build/html -t $RPM_BUILD_ROOT%{docdir}
 
 %check
 # note: the oauth tests will work once the proper module gets into rawhide
@@ -130,10 +126,13 @@ popd
 %{python_sitelib}/tastypie/*
 
 %files doc
-%doc %{docdir}
-%exclude %{docdir}/html/.*
+%doc docs/_build/html
 
 %changelog
+* Tue Aug 27 2013 Bohuslav Kabrda <bkabrda at redhat.com> - 0.9.14-4
+- Fix unversioned docdir issue (rhbz#1001252).
+- Fix bogus changelog entry.
+
 * Sun Aug 11 2013 Cédric OLIVIER <cedric.olivier at free.fr> 0.9.14-3
 - Change Docdir to Unversioned Docdir
 
@@ -177,5 +176,5 @@ are soft requirements, so they aren't in Requires)
 - Adding check section
 - Adding documentation subpackage
 
-* Wed Mar 02 2012 Cédric OLIVIER <cedric.olivier at free.fr> 0.9.11-1
+* Fri Mar 02 2012 Cédric OLIVIER <cedric.olivier at free.fr> 0.9.11-1
 - Initial version of the package


More information about the scm-commits mailing list