Compare commits
4 Commits
f18
...
python-sph
| Author | SHA1 | Date | |
|---|---|---|---|
|
b92d893701 | ||
|
|
d78b82c210 | ||
|
|
832315ea1b | ||
|
|
0fa81e247c |
1
.cvsignore
Normal file
1
.cvsignore
Normal file
@@ -0,0 +1 @@
|
||||
Sphinx-0.6.5.tar.gz
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1 +0,0 @@
|
||||
/Sphinx-1.1.3.tar.gz
|
||||
21
Makefile
Normal file
21
Makefile
Normal file
@@ -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)
|
||||
56
python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch
Normal file
56
python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch
Normal file
@@ -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')
|
||||
24
python-sphinx-0.6.5_setuptools.patch
Normal file
24
python-sphinx-0.6.5_setuptools.patch
Normal file
@@ -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
|
||||
@@ -1,52 +1,33 @@
|
||||
%if 0%{?fedora}
|
||||
%global with_python3 1
|
||||
%{!?python3_version: %global python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])")}
|
||||
%else
|
||||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
|
||||
%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
|
||||
|
||||
%global upstream_name Sphinx
|
||||
|
||||
Name: python-sphinx
|
||||
Version: 1.1.3
|
||||
Release: 5%{?dist}
|
||||
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
|
||||
# Sent upstream as a fix to work with the next version of docutils
|
||||
# https://bitbucket.org/birkenfeld/sphinx/issue/998/docutils-010-will-break-sphinx-manpage
|
||||
Patch0: sphinx-docutils-0.10.patch
|
||||
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
|
||||
|
||||
%if 0%{?with_python3}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-docutils
|
||||
BuildRequires: python3-jinja2
|
||||
BuildRequires: python3-pygments
|
||||
BuildRequires: python3-nose
|
||||
%endif # with_python3
|
||||
|
||||
Requires: python-docutils
|
||||
Requires: python-jinja2
|
||||
Requires: python-pygments
|
||||
|
||||
|
||||
%description
|
||||
Sphinx is a tool that makes it easy to create intelligent and
|
||||
beautiful documentation for Python projects (or other documents
|
||||
@@ -76,44 +57,6 @@ the Python docs:
|
||||
snippets and inclusion of appropriately formatted docstrings.
|
||||
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-sphinx
|
||||
Summary: Python documentation generator
|
||||
Group: Development/Tools
|
||||
Requires: python3-docutils
|
||||
Requires: python3-jinja2
|
||||
Requires: python3-pygments
|
||||
|
||||
%description -n python3-sphinx
|
||||
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
|
||||
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.
|
||||
|
||||
Sphinx uses reStructuredText as its markup language, and many of its
|
||||
strengths come from the power and straightforwardness of
|
||||
reStructuredText and its parsing and translating suite, the Docutils.
|
||||
|
||||
Although it is still under constant development, the following
|
||||
features are already present, work fine and can be seen "in action" in
|
||||
the Python docs:
|
||||
|
||||
* Output formats: HTML (including Windows HTML Help) and LaTeX,
|
||||
for printable PDF versions
|
||||
* Extensive cross-references: semantic markup and automatic links
|
||||
for functions, classes, glossary terms and similar pieces of
|
||||
information
|
||||
* Hierarchical structure: easy definition of a document tree, with
|
||||
automatic links to siblings, parents and children
|
||||
* Automatic indices: general index as well as a module index
|
||||
* Code handling: automatic highlighting using the Pygments highlighter
|
||||
* Various extensions are available, e.g. for automatic testing of
|
||||
snippets and inclusion of appropriately formatted docstrings.
|
||||
%endif # with_python3
|
||||
|
||||
|
||||
%package doc
|
||||
Summary: Documentation for %{name}
|
||||
Group: Documentation
|
||||
@@ -133,70 +76,38 @@ 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
|
||||
|
||||
%patch0 -p1
|
||||
|
||||
%if 0%{?with_python3}
|
||||
rm -rf %{py3dir}
|
||||
cp -a . %{py3dir}
|
||||
%endif # with_python3
|
||||
|
||||
|
||||
%build
|
||||
%{__python} setup.py build
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
%{__python3} setup.py build
|
||||
popd
|
||||
%endif # with_python3
|
||||
|
||||
pushd doc
|
||||
make html
|
||||
make man
|
||||
rm -rf _build/html/.buildinfo
|
||||
mv _build/html ..
|
||||
rm -rf _*
|
||||
popd
|
||||
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
# Must do the python3 install first because the scripts in /usr/bin are
|
||||
# overwritten with every setup.py install (and we want the python2 version
|
||||
# to be the default for now).
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
%{__python3} setup.py install --skip-build --root %{buildroot}
|
||||
for f in %{buildroot}%{_bindir}/sphinx-*;
|
||||
do
|
||||
mv $f $f-%{python3_version}
|
||||
done
|
||||
popd
|
||||
%endif # with_python3
|
||||
|
||||
%{__python} setup.py install --skip-build --root %{buildroot}
|
||||
|
||||
|
||||
pushd doc
|
||||
# Deliver man pages
|
||||
install -d %{buildroot}%{_mandir}/man1
|
||||
mv _build/man/sphinx-*.1 %{buildroot}%{_mandir}/man1/
|
||||
%if 0%{?with_python3}
|
||||
for f in %{buildroot}%{_mandir}/man1/sphinx-*.1;
|
||||
do
|
||||
cp -p $f $(echo $f | sed -e "s|.1$|-%{python3_version}.1|")
|
||||
done
|
||||
%endif # with_python3
|
||||
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 "`;
|
||||
@@ -219,108 +130,29 @@ popd
|
||||
>> sphinx.lang
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%check
|
||||
make test
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
make test
|
||||
popd
|
||||
%endif # with_python3
|
||||
|
||||
|
||||
%files -f sphinx.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
|
||||
%exclude %{_bindir}/sphinx-*-%{python3_version}
|
||||
%{_bindir}/sphinx-*
|
||||
%{python_sitelib}/*
|
||||
%dir %{_datadir}/sphinx/
|
||||
%dir %{_datadir}/sphinx/locale
|
||||
%dir %{_datadir}/sphinx/locale/*
|
||||
%exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1*
|
||||
%{_datadir}/sphinx/
|
||||
%exclude %{_datadir}/sphinx/locale/*/sphinx.js
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-sphinx
|
||||
%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
|
||||
%{_bindir}/sphinx-*-%{python3_version}
|
||||
%{python3_sitelib}/*
|
||||
%dir %{_datadir}/sphinx/
|
||||
%dir %{_datadir}/sphinx/locale
|
||||
%dir %{_datadir}/sphinx/locale/*
|
||||
%{_mandir}/man1/sphinx-*-%{python3_version}.1*
|
||||
%endif # with_python3
|
||||
|
||||
%files doc
|
||||
%defattr(-,root,root,-)
|
||||
%doc html reST
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Aug 21 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 1.1.3-5
|
||||
- Fix for use of sphinx's manpage writer with docutils-0.10
|
||||
|
||||
* Mon Aug 6 2012 Michel Salim <salimma@fedoraproject.org> - 1.1.3-4
|
||||
- Rebuild for Python 3.3
|
||||
|
||||
* Fri Aug 3 2012 David Malcolm <dmalcolm@redhat.com> - 1.1.3-3
|
||||
- remove rhel logic from with_python3 conditional
|
||||
|
||||
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Thu Apr 5 2012 Michel Salim <salimma@fedoraproject.org> - 1.1.3-1
|
||||
- Update to 1.1.3
|
||||
|
||||
* Sun Feb 5 2012 Michel Salim <salimma@fedoraproject.org> - 1.1.2-5
|
||||
- Move python3 runtime dependencies to the right subpackage
|
||||
- Properly exclude python3 binaries
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Sat Dec 17 2011 Michel Salim <salimma@fedoraproject.org> - 1.1.2-3
|
||||
- BR on texlive-latex for LaTeX tests
|
||||
|
||||
* Thu Dec 8 2011 Michel Salim <salimma@fedoraproject.org> - 1.1.2-2
|
||||
- Enable python3 subpackage
|
||||
|
||||
* Mon Nov 28 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 1.1.2-1
|
||||
- Update to upstream 1.1.2
|
||||
|
||||
* 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
|
||||
|
||||
|
||||
2
sources
2
sources
@@ -1 +1 @@
|
||||
8f55a6d4f87fc6d528120c5d1f983e98 Sphinx-1.1.3.tar.gz
|
||||
86dd5dbd55cb44d1f8091a4a1c3743b2 Sphinx-0.6.5.tar.gz
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
diff -up Sphinx-1.1.3/sphinx/writers/manpage.py.bak Sphinx-1.1.3/sphinx/writers/manpage.py
|
||||
--- Sphinx-1.1.3/sphinx/writers/manpage.py.bak 2011-11-01 00:38:44.000000000 -0700
|
||||
+++ Sphinx-1.1.3/sphinx/writers/manpage.py 2012-08-21 12:38:33.380808202 -0700
|
||||
@@ -72,6 +72,11 @@ class ManualPageTranslator(BaseTranslato
|
||||
# since self.append_header() is never called, need to do this here
|
||||
self.body.append(MACRO_DEF)
|
||||
|
||||
+ # Overwrite admonition label translations with our own
|
||||
+ for label, translation in admonitionlabels.items():
|
||||
+ self.language.labels[label] = self.deunicode(translation)
|
||||
+
|
||||
+
|
||||
# overwritten -- added quotes around all .TH arguments
|
||||
def header(self):
|
||||
tmpl = (".TH \"%(title_upper)s\" \"%(manual_section)s\""
|
||||
@@ -193,12 +198,6 @@ class ManualPageTranslator(BaseTranslato
|
||||
def depart_seealso(self, node):
|
||||
self.depart_admonition(node)
|
||||
|
||||
- # overwritten -- use our own label translations
|
||||
- def visit_admonition(self, node, name=None):
|
||||
- if name:
|
||||
- self.body.append('.IP %s\n' %
|
||||
- self.deunicode(admonitionlabels.get(name, name)))
|
||||
-
|
||||
def visit_productionlist(self, node):
|
||||
self.ensure_eol()
|
||||
names = []
|
||||
Reference in New Issue
Block a user