Compare commits
3 Commits
python-sph
...
python-sph
| Author | SHA1 | Date | |
|---|---|---|---|
|
12c3de4bd6 | ||
|
|
1f61c2034c | ||
|
|
50327b0679 |
@@ -1 +1 @@
|
||||
Sphinx-0.6.5.tar.gz
|
||||
Sphinx-0.3.tar.gz
|
||||
|
||||
2
Makefile
2
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 $$d/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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
@@ -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')
|
||||
@@ -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
|
||||
@@ -1,31 +1,22 @@
|
||||
%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
|
||||
%{!?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]")}
|
||||
|
||||
%global upstream_name Sphinx
|
||||
%define upstream_name Sphinx
|
||||
|
||||
Name: python-sphinx
|
||||
Version: 0.6.5
|
||||
Release: 2%{?dist}
|
||||
Summary: Python documentation generator
|
||||
Name: python-sphinx
|
||||
Version: 0.3
|
||||
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
|
||||
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
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
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
|
||||
BuildArch: noarch
|
||||
BuildRequires: python-devel python-docutils python-jinja python-setuptools
|
||||
Requires: python-docutils python-jinja python-pygments
|
||||
|
||||
|
||||
%description
|
||||
@@ -57,14 +48,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
|
||||
@@ -72,141 +63,47 @@ 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 reST and HTML formats.
|
||||
This package contains documentation in rST 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
|
||||
%{__python} setup.py build
|
||||
pushd doc
|
||||
cd doc
|
||||
make html
|
||||
rm -rf _build/html/.buildinfo
|
||||
mv _build/html ..
|
||||
rm -rf _*
|
||||
popd
|
||||
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%{__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
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
# Fix EOL delimiters
|
||||
sed -i 's|\r||g' LICENSE
|
||||
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%check
|
||||
make test
|
||||
|
||||
|
||||
%files -f sphinx.lang
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
|
||||
%doc AUTHORS CHANGES LICENSE README TODO
|
||||
%{_bindir}/sphinx-*
|
||||
%{python_sitelib}/*
|
||||
%{_datadir}/sphinx/
|
||||
%exclude %{_datadir}/sphinx/locale/*/sphinx.js
|
||||
%{_mandir}/man1/*
|
||||
%{python_sitelib}/sphinx
|
||||
%if 0%{?fedora} >= 8
|
||||
%{python_sitelib}/*.egg-info
|
||||
%endif
|
||||
|
||||
%files doc
|
||||
%defattr(-,root,root,-)
|
||||
%doc html reST
|
||||
%doc doc html
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri May 21 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.5-2
|
||||
- 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
|
||||
|
||||
* Wed Jan 13 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.4-1
|
||||
- Update to 0.6.4
|
||||
- Fixes a problem using autodoc with pylons projects.
|
||||
|
||||
* Fri Sep 4 2009 Michel Salim <salimma@fedoraproject.org> - 0.6.3-1
|
||||
- Update to 0.6.3
|
||||
|
||||
* Mon Aug 17 2009 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.2-1
|
||||
- Update to 0.6.2 -- upstream bugfix requested inside bz#512438
|
||||
|
||||
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Fri Jun 05 2009 Luke Macken <lmacken@redhat.com> - 0.6.1-2
|
||||
- Add a patch to use our own setuptools package
|
||||
|
||||
* Fri Apr 17 2009 Michel Salim <salimma@fedoraproject.org> - 0.6.1-1
|
||||
- Update to 0.6.1
|
||||
|
||||
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Fri Jan 2 2009 Michel Salim <salimma@fedoraproject.org> - 0.5.1-1
|
||||
- Update to 0.5.1
|
||||
|
||||
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.5-2
|
||||
- Rebuild for Python 2.6
|
||||
|
||||
* Mon Nov 24 2008 Michel Salim <salimma@fedoraproject.org> - 0.5-1
|
||||
- Update to 0.5
|
||||
|
||||
* Fri Oct 10 2008 Michel Salim <salimma@fedoraproject.org> - 0.4.3-1
|
||||
- Update to 0.4.3
|
||||
|
||||
* Wed Aug 27 2008 Toshio Kuratomi <toshio@fedoraproject.org> - 0.4.2-1.1
|
||||
- Fix for EL-5 build.
|
||||
|
||||
* Mon Aug 25 2008 Michel Salim <salimma@fedoraproject.org> - 0.4.2-1
|
||||
- Update to 0.4.2
|
||||
|
||||
* Mon May 26 2008 Michel Salim <salimma@fedoraproject.org> - 0.3-1
|
||||
- Update to 0.3
|
||||
|
||||
|
||||
Reference in New Issue
Block a user