- 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-1.0.8.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,29 +5,24 @@
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-Version:    1.0.8
+Version:    0.6.5
 Release:    2%{?dist}
 Summary:    Python documentation generator
 
 Group:      Development/Tools
-
-# 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)
+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
 BuildRequires: python2-devel >= 2.4
 BuildRequires: python-setuptools
 BuildRequires: python-docutils
 BuildRequires: python-jinja2
 BuildRequires: python-nose
-# Test dependencies
-BuildRequires: texlive-latex
-
 Requires:      python-docutils
 Requires:      python-jinja2
 Requires:      python-pygments
@@ -81,16 +76,19 @@ This package contains documentation in reST and HTML formats.
 
 
 %prep
-%setup -q -n %{upstream_name}-%{version}%{?prerel}
+%setup -q -n %{upstream_name}-%{version}
+%patch0 -p1 -b .setuptools
+%patch1 -p1 -b .language_files
+
 sed '1d' -i sphinx/pycode/pgen2/token.py
 
 %build
 %{__python} setup.py build
 pushd doc
 make html
-make man
 rm -rf _build/html/.buildinfo
 mv _build/html ..
+rm -rf _*
 popd
 
 
@@ -103,16 +101,13 @@ rm -rf %{buildroot}
 pushd doc
 # Deliver man pages
 install -d %{buildroot}%{_mandir}/man1
-mv _build/man/sphinx-*.1 %{buildroot}%{_mandir}/man1/
+mv 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;
-# 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 "`;
@@ -135,6 +130,10 @@ popd
   >> sphinx.lang
 
 
+%clean
+rm -rf %{buildroot}
+
+
 %check
 make test
 
@@ -144,9 +143,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
@@ -155,45 +153,6 @@ make test
 
 
 %changelog
-* Thu Apr  5 2012 Michel Salim <salimma@fedoraproject.org> - 1.0.8-2
-- BR on texlive-latex for LaTeX tests
-
-* Thu Apr  5 2012 Michel Salim <salimma@fedoraproject.org> - 1.0.8-1
-- Update to upstream 1.0.8
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* 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
-
-* Wed May 26 2010 Michel Salim <salimma@fedoraproject.org> - 1.0-0.1.b1
-- Update to 1.0 beta 1
-
-* 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 @@
-6f9aace3f7e523ce55514eafa2764c6f  Sphinx-1.0.8.tar.gz
+86dd5dbd55cb44d1f8091a4a1c3743b2  Sphinx-0.6.5.tar.gz