- Update to upstream 1.0.7

since 0.6.6

.cvsignore

@@ -1 +0,0 @@
-Sphinx-1.0b2.tar.gz

.gitignore

@@ -0,0 +1,3 @@
+/Sphinx-1.0.4.tar.gz
+/Sphinx-1.0.6.tar.gz
+/Sphinx-1.0.7.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: python-sphinx
-# $Id$
-NAME := python-sphinx
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

python-sphinx.spec

@@ -3,19 +3,22 @@
 %endif
 
 %global upstream_name Sphinx
-%global prerel b2
 
 Name:       python-sphinx
-Version:    1.0
-Release:    %{?prerel:0.}1.%{?prerel}%{?dist}
+Version:    1.0.7
+Release:    1%{?dist}
 Summary:    Python documentation generator
 
 Group:      Development/Tools
-License:    BSD
-URL:        http://sphinx.pocoo.org/
-Source0:    http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}%{?prerel}.tar.gz
 
-BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+# Unless otherwise noted, the license for code is BSD
+# sphinx/util/stemmer.py Public Domain
+# sphinx/pycode/pgen2 Python
+# jquery (MIT or GPLv2)
+License:    BSD and Public Domain and Python and (MIT or GPLv2)
+URL:        http://sphinx.pocoo.org/
+Source0:    http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
+
 BuildArch:     noarch
 BuildRequires: python2-devel >= 2.4
 BuildRequires: python-setuptools
@@ -82,9 +85,9 @@ sed '1d' -i sphinx/pycode/pgen2/token.py
 %{__python} setup.py build
 pushd doc
 make html
+make man
 rm -rf _build/html/.buildinfo
 mv _build/html ..
-rm -rf _*
 popd
 
 
@@ -94,17 +97,19 @@ rm -rf %{buildroot}
 %{__python} setup.py install --skip-build --root %{buildroot}
 
 
-# Manpages not in beta release yet
-#pushd doc
+pushd doc
 # Deliver man pages
-#install -d %{buildroot}%{_mandir}/man1
-#mv sphinx-*.1 %{buildroot}%{_mandir}/man1/
-#popd
+install -d %{buildroot}%{_mandir}/man1
+mv _build/man/sphinx-*.1 %{buildroot}%{_mandir}/man1/
+popd
 
 # Deliver rst files
+rm -rf doc/_build
+sed -i 's|python ../sphinx-build.py|/usr/bin/sphinx-build|' doc/Makefile
 mv doc reST
 
-# Move language files to /usr/share in association with %patch1
+# Move language files to /usr/share;
+# patch to support this incorporated in 0.6.6
 pushd %{buildroot}%{python_sitelib}
 
 for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -printf "%f "`;
@@ -127,10 +132,6 @@ popd
   >> sphinx.lang
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %check
 make test
 
@@ -140,9 +141,10 @@ make test
 %doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
 %{_bindir}/sphinx-*
 %{python_sitelib}/*
-%{_datadir}/sphinx/
-%exclude %{_datadir}/sphinx/locale/*/sphinx.js
-#%{_mandir}/man1/*
+%dir %{_datadir}/sphinx/
+%dir %{_datadir}/sphinx/locale
+%dir %{_datadir}/sphinx/locale/*
+%{_mandir}/man1/*
 
 %files doc
 %defattr(-,root,root,-)
@@ -150,6 +152,26 @@ make test
 
 
 %changelog
+* Tue Jan 18 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 1.0.7-1
+- Update to upstream 1.0.7
+
+* Mon Jan 17 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 1.0.6-1
+- Update to upstream 1.0.6
+
+* Mon Nov  1 2010 Michel Salim <salimma@fedoraproject.org> - 1.0.4-3
+- Fix -doc Makefile to allow regeneration of .rst files
+
+* Mon Nov  1 2010 Michel Salim <salimma@fedoraproject.org> - 1.0.4-2
+- Actually include *.js locale files
+- Generate manpages
+
+* Fri Sep 17 2010 Michel Salim <salimma@fedoraproject.org> - 1.0.4-1
+- Update to 1.0.4
+- Remove BuildRoot and %%clean declarations
+
+* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.0-0.1.b2.1
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
 * Mon May 31 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 1.0-0.2.b2
 - Update to 1.0 beta 2
 - Fixes problem building html documentation in non-English locales

sources

@@ -1 +1 @@
-6bf13da4fd0542cc85705d1c4abd3c0a  Sphinx-1.0b2.tar.gz
+42c722d48e52d4888193965dd473adb5  Sphinx-1.0.7.tar.gz