- Update to 0.6.6

Mon May 10 2010 Gareth Armstrong <gareth.armstrong@hp.com> - 0.6.5-1.hp
- Update to 0.6.5
- Initial import of python-sphinx from Fedora Rawhide for use in HP CMS
- Enforce that Sphinx requires Python 2.4 or later via an explicit BR
- Minor tweaks to spec file
- Move language files to %%{_datadir}, idea borrowed from Debian's sphinx
    package
- Deliver man pages for sphinx-build & sphinx-quickstart
- Deliver rst documentation files to reST directory in doc sub-package
- Add %%check section for Python2 and add BR on python-nose

Makefile

@@ -0,0 +1,21 @@
+# 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)

branch

@@ -0,0 +1 @@
+F-12

python-sphinx.spec

@@ -6,7 +6,7 @@
 
 Name:       python-sphinx
 Version:    0.6.6
-Release:    3%{?dist}
+Release:    1%{?dist}
 Summary:    Python documentation generator
 
 Group:      Development/Tools
@@ -83,8 +83,7 @@ pushd doc
 make html
 rm -rf _build/html/.buildinfo
 mv _build/html ..
-rm -rf _build
-sed -i 's|python ../sphinx-build.py|/usr/bin/sphinx-build|' Makefile
+rm -rf _*
 popd
 
 
@@ -103,8 +102,7 @@ popd
 # Deliver rst files
 mv doc reST
 
-# Move language files to /usr/share;
-# patch to support this incorporated in 0.6.6
+# Move language files to /usr/share in association with %patch1
 pushd %{buildroot}%{python_sitelib}
 
 for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -printf "%f "`;
@@ -140,9 +138,8 @@ make test
 %doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
 %{_bindir}/sphinx-*
 %{python_sitelib}/*
-%dir %{_datadir}/sphinx/
-%dir %{_datadir}/sphinx/locale
-%dir %{_datadir}/sphinx/locale/*
+%{_datadir}/sphinx/
+%exclude %{_datadir}/sphinx/locale/*/sphinx.js
 %{_mandir}/man1/*
 
 %files doc
@@ -151,12 +148,6 @@ make test
 
 
 %changelog
-* Mon Nov  1 2010 Michel Salim <salimma@fedoraproject.org> - 0.6.6-3
-- Fix -doc Makefile to allow regeneration of .rst files
-
-* Mon Nov  1 2010 Michel Salim <salimma@fedoraproject.org> - 0.6.6-2
-- Actually include *.js locale files
-
 * Tue May 25 2010 Michel Salim <salimma@fedoraproject.org> - 0.6.6-1
 - Update to 0.6.6