From 0fa81e247c96f9a5a9a4e015871fd02f927e970b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 06:38:08 +0000 Subject: [PATCH 1/6] Initialize branch F-12 for python-sphinx --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 832315ea1bba467aae0ed93174542a1e0442038a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:55:27 +0000 Subject: [PATCH 2/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b609317..be369c3 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +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)) From d78b82c2108bfa736ebd4531ccecc39402ef5846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Wed, 13 Jan 2010 19:34:37 +0000 Subject: [PATCH 3/6] - Update to 0.6.4 - Fixes a problem using autodoc with pylons projects. --- .cvsignore | 2 +- python-sphinx.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index f877c40..ab16ecd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Sphinx-0.6.3.tar.gz +Sphinx-0.6.4.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index e0e2077..33f73ae 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -4,7 +4,7 @@ %define upstream_name Sphinx Name: python-sphinx -Version: 0.6.3 +Version: 0.6.4 Release: 1%{?dist} Summary: Python documentation generator @@ -109,6 +109,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 13 2010 Toshio Kuratomi - 0.6.4-1 +- Update to 0.6.4 +- Fixes a problem using autodoc with pylons projects. + * Fri Sep 4 2009 Michel Salim - 0.6.3-1 - Update to 0.6.3 diff --git a/sources b/sources index 5354ced..ad5c2c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8ba063eeeaf818a7ea07fd28d9614a9 Sphinx-0.6.3.tar.gz +a65e0bcff6f79a7c013220d00ea137ad Sphinx-0.6.4.tar.gz From b92d893701bf56976935908c31d0a7f9c117065e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Sat, 22 May 2010 01:22:46 +0000 Subject: [PATCH 4/6] - Few minor tweaks to Gareth's spec file update Mon May 10 2010 Gareth Armstrong - 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 | 2 +- ....5_move_locale_files_outside_sitelib.patch | 56 ++++++++ python-sphinx-0.6.5_setuptools.patch | 24 ++++ python-sphinx-setuptools.patch | 9 -- python-sphinx.spec | 136 +++++++++++++----- sources | 2 +- 6 files changed, 179 insertions(+), 50 deletions(-) create mode 100644 python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch create mode 100644 python-sphinx-0.6.5_setuptools.patch delete mode 100644 python-sphinx-setuptools.patch diff --git a/.cvsignore b/.cvsignore index ab16ecd..11c96c5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Sphinx-0.6.4.tar.gz +Sphinx-0.6.5.tar.gz diff --git a/python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch b/python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch new file mode 100644 index 0000000..76dffc4 --- /dev/null +++ b/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') diff --git a/python-sphinx-0.6.5_setuptools.patch b/python-sphinx-0.6.5_setuptools.patch new file mode 100644 index 0000000..e8bcc44 --- /dev/null +++ b/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 diff --git a/python-sphinx-setuptools.patch b/python-sphinx-setuptools.patch deleted file mode 100644 index c4cfb6a..0000000 --- a/python-sphinx-setuptools.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- setup.py.orig 2009-06-05 07:42:36.000000000 -0400 -+++ setup.py 2009-06-05 07:42:40.000000000 -0400 -@@ -1,6 +1,4 @@ - # -*- coding: utf-8 -*- --import ez_setup --ez_setup.use_setuptools() - - import os - import sys diff --git a/python-sphinx.spec b/python-sphinx.spec index 33f73ae..52c5b4f 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -1,23 +1,31 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} +%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%endif -%define upstream_name Sphinx +%global upstream_name Sphinx -Name: python-sphinx -Version: 0.6.4 -Release: 1%{?dist} -Summary: Python documentation generator +Name: python-sphinx +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}-setuptools.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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 -BuildArch: noarch -BuildRequires: python-devel python-docutils python-jinja2 python-setuptools -Requires: python-docutils python-jinja2 python-pygments +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 +Requires: python-docutils +Requires: python-jinja2 +Requires: python-pygments %description @@ -49,14 +57,14 @@ the Python docs: snippets and inclusion of appropriately formatted docstrings. -%package doc -Summary: Documentation for %{name} -Group: Documentation -License: BSD -Requires: %{name} = %{version}-%{release} +%package doc +Summary: Documentation for %{name} +Group: Documentation +License: BSD +Requires: %{name} = %{version}-%{release} -%description doc +%description doc Sphinx is a tool that makes it easy to create intelligent and beautiful documentation for Python projects (or other documents consisting of multiple reStructuredText sources), written by Georg @@ -64,51 +72,101 @@ Brandl. It was originally created to translate the new Python documentation, but has now been cleaned up in the hope that it will be useful to many other projects. -This package contains documentation in rST and HTML formats +This package contains documentation in reST and HTML formats. %prep %setup -q -n %{upstream_name}-%{version} -%patch0 -p0 -b .setuptools +%patch0 -p1 -b .setuptools +%patch1 -p1 -b .language_files +sed '1d' -i sphinx/pycode/pgen2/token.py %build %{__python} setup.py build -cd doc +pushd doc make html +rm -rf _build/html/.buildinfo mv _build/html .. rm -rf _* +popd %install -rm -rf $RPM_BUILD_ROOT -# Fix EOL delimiters -sed -i 's|\r||g' LICENSE -%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT +rm -rf %{buildroot} -# Language files; not under /usr/share, need to be handled manually -(cd $RPM_BUILD_ROOT && find . -name 'sphinx.mo') | sed -e 's|^.||' | sed -e \ - 's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \ - >> %{name}.lang +%{__python} setup.py install --skip-build --root %{buildroot} + + +pushd doc +# Deliver man pages +install -d %{buildroot}%{_mandir}/man1 +mv sphinx-*.1 %{buildroot}%{_mandir}/man1/ +popd + +# Deliver rst files +mv doc reST + +# 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 "`; +do + install -d %{buildroot}%{_datadir}/sphinx/locale/$lang + install -d %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES + mv sphinx/locale/$lang/LC_MESSAGES/sphinx.js \ + %{buildroot}%{_datadir}/sphinx/locale/$lang/ + mv sphinx/locale/$lang/LC_MESSAGES/sphinx.mo \ + %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/ + rm -rf sphinx/locale/$lang +done +popd +%find_lang sphinx + +# Language files; Since these are javascript, it's not immediately obvious to +# find_lang that they need to be marked with a language. +(cd %{buildroot} && find . -name 'sphinx.js') | sed -e 's|^.||' | sed -e \ + 's:\(.*/locale/\)\([^/_]\+\)\(.*\.js$\):%lang(\2) \1\2\3:' \ + >> sphinx.lang %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%files -f %{name}.lang +%check +make test + + +%files -f sphinx.lang %defattr(-,root,root,-) -%doc AUTHORS CHANGES LICENSE README TODO +%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO %{_bindir}/sphinx-* -%{python_sitelib}/sphinx -%{python_sitelib}/*.egg-info +%{python_sitelib}/* +%{_datadir}/sphinx/ +%exclude %{_datadir}/sphinx/locale/*/sphinx.js +%{_mandir}/man1/* %files doc %defattr(-,root,root,-) -%doc doc html +%doc html reST %changelog +* Fri May 21 2010 Toshio Kuratomi - 0.6.5-2 +- Few minor tweaks to Gareth's spec file update + +* Mon May 10 2010 Gareth Armstrong - 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 + * Wed Jan 13 2010 Toshio Kuratomi - 0.6.4-1 - Update to 0.6.4 - Fixes a problem using autodoc with pylons projects. diff --git a/sources b/sources index ad5c2c8..6c0c1e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a65e0bcff6f79a7c013220d00ea137ad Sphinx-0.6.4.tar.gz +86dd5dbd55cb44d1f8091a4a1c3743b2 Sphinx-0.6.5.tar.gz From f1b1a64bf775d8d38ec5b992f293848159492eee Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 25 May 2010 22:35:08 +0000 Subject: [PATCH 5/6] - Update to 0.6.6 --- .cvsignore | 2 +- ....5_move_locale_files_outside_sitelib.patch | 56 ------------------- python-sphinx-0.6.5_setuptools.patch | 24 -------- python-sphinx.spec | 12 ++-- sources | 2 +- 5 files changed, 7 insertions(+), 89 deletions(-) delete mode 100644 python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch delete mode 100644 python-sphinx-0.6.5_setuptools.patch diff --git a/.cvsignore b/.cvsignore index 11c96c5..e348134 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Sphinx-0.6.5.tar.gz +Sphinx-0.6.6.tar.gz diff --git a/python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch b/python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch deleted file mode 100644 index 76dffc4..0000000 --- a/python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch +++ /dev/null @@ -1,56 +0,0 @@ -# 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') diff --git a/python-sphinx-0.6.5_setuptools.patch b/python-sphinx-0.6.5_setuptools.patch deleted file mode 100644 index e8bcc44..0000000 --- a/python-sphinx-0.6.5_setuptools.patch +++ /dev/null @@ -1,24 +0,0 @@ -# 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 diff --git a/python-sphinx.spec b/python-sphinx.spec index 52c5b4f..2fc0770 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -5,16 +5,14 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 0.6.5 -Release: 2%{?dist} +Version: 0.6.6 +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}.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 @@ -77,9 +75,6 @@ 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 @@ -153,6 +148,9 @@ make test %changelog +* Tue May 25 2010 Michel Salim - 0.6.6-1 +- Update to 0.6.6 + * Fri May 21 2010 Toshio Kuratomi - 0.6.5-2 - Few minor tweaks to Gareth's spec file update diff --git a/sources b/sources index 6c0c1e6..a951d99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -86dd5dbd55cb44d1f8091a4a1c3743b2 Sphinx-0.6.5.tar.gz +840f6dbbecbb4979a204909f5656c723 Sphinx-0.6.6.tar.gz From 9f264bda5ffceb06a0a8aae8fa79bf0ed18e7c36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 10:43:42 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index be369c3..0000000 --- a/Makefile +++ /dev/null @@ -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) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12