- Few minor tweaks to Gareth's spec file update

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

.cvsignore

@@ -0,0 +1 @@
+Sphinx-0.6.5.tar.gz

.gitignore

@@ -1 +0,0 @@
-Sphinx-0.6.6.tar.gz

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-13

python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch

@@ -0,0 +1,56 @@
+# HG changeset patch
+# Parent 552e51b26229a9a918c76a401f2f487bf81f2ee6
+
+Index: Sphinx-0.6.5/sphinx/builders/html.py
+===================================================================
+--- Sphinx-0.6.5.orig/sphinx/builders/html.py
++++ Sphinx-0.6.5/sphinx/builders/html.py
+@@ -10,6 +10,7 @@
+ """
+ 
+ import os
++import sys
+ import codecs
+ import posixpath
+ import cPickle as pickle
+@@ -91,10 +92,15 @@ class StandaloneHTMLBuilder(Builder):
+             self.link_suffix = self.out_suffix
+ 
+         if self.config.language is not None:
+-            jsfile = path.join(package_dir, 'locale', self.config.language,
+-                               'LC_MESSAGES', 'sphinx.js')
+-            if path.isfile(jsfile):
+-                self.script_files.append('_static/translations.js')
++            jsfile_list = [path.join(package_dir, 'locale',
++                self.config.language, 'LC_MESSAGES', 'sphinx.js'),
++                path.join(sys.prefix, 'share/sphinx/locale',
++                    self.config.language, 'sphinx.js')]
++
++            for jsfile in jsfile_list:
++                if path.isfile(jsfile):
++                    self.script_files.append('_static/translations.js')
++                    break
+ 
+     def init_templates(self):
+         Theme.init_themes(self)
+@@ -528,11 +534,15 @@ class StandaloneHTMLBuilder(Builder):
+         f.close()
+         # then, copy translations JavaScript file
+         if self.config.language is not None:
+-            jsfile = path.join(package_dir, 'locale', self.config.language,
+-                               'LC_MESSAGES', 'sphinx.js')
+-            if path.isfile(jsfile):
+-                copyfile(jsfile, path.join(self.outdir, '_static',
+-                                           'translations.js'))
++            jsfile_list = [path.join(package_dir, 'locale',
++                self.config.language, 'LC_MESSAGES', 'sphinx.js'),
++                path.join(sys.prefix, 'share/sphinx/locale',
++                    self.config.language, 'sphinx.js')]
++            for jsfile in jsfile_list:
++                if path.isfile(jsfile):
++                    copyfile(jsfile, path.join(self.outdir, '_static',
++                                               'translations.js'))
++                    break
+         # then, copy over all user-supplied static files
+         if self.theme:
+             staticdirnames = [path.join(themepath, 'static')

python-sphinx-0.6.5_setuptools.patch

@@ -0,0 +1,24 @@
+# HG changeset patch
+# Parent 5da6d572bd088b04711b3bf70991c976d8f9c605
+
+Index: Sphinx-0.6.5/setup.py
+===================================================================
+--- Sphinx-0.6.5.orig/setup.py
++++ Sphinx-0.6.5/setup.py
+@@ -1,10 +1,13 @@
+ # -*- coding: utf-8 -*-
+-import ez_setup
+-ez_setup.use_setuptools()
++try:
++    from setuptools import setup, find_packages
++except ImportError:
++    import ez_setup
++    ez_setup.use_setuptools()
++    from setuptools import setup, find_packages
+ 
+ import os
+ import sys
+-from setuptools import setup, find_packages
+ from distutils import log
+ 
+ import sphinx

python-sphinx.spec

@@ -5,14 +5,16 @@
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-Version:    0.6.6
-Release:    1%{?dist}
+Version:    0.6.5
+Release:    2%{?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}.tar.gz
+Patch0:     %{name}-0.6.5_setuptools.patch
+Patch1:     %{name}-0.6.5_move_locale_files_outside_sitelib.patch
 
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:     noarch
@@ -75,6 +77,9 @@ This package contains documentation in reST and HTML formats.
 
 %prep
 %setup -q -n %{upstream_name}-%{version}
+%patch0 -p1 -b .setuptools
+%patch1 -p1 -b .language_files
+
 sed '1d' -i sphinx/pycode/pgen2/token.py
 
 %build
@@ -148,9 +153,6 @@ make test
 
 
 %changelog
-* Tue May 25 2010 Michel Salim <salimma@fedoraproject.org> - 0.6.6-1
-- Update to 0.6.6
-
 * Fri May 21 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.5-2
 - Few minor tweaks to Gareth's spec file update
 

sources

@@ -1 +1 @@
-840f6dbbecbb4979a204909f5656c723  Sphinx-0.6.6.tar.gz
+86dd5dbd55cb44d1f8091a4a1c3743b2  Sphinx-0.6.5.tar.gz