From 37e31093e7f6c0e27a28fbd1cf2dc56fa46ed121 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 8 Dec 2011 17:15:02 +0100 Subject: [PATCH 1/5] Revert el6 branch to Sphinx 1.0.x This reverts commit f55dc614d6616e49d2ccaaad55c3296b81937bba. --- .gitignore | 1 - python-sphinx.spec | 7 ++----- sources | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 17ed307..0749f5b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /Sphinx-1.0.4.tar.gz /Sphinx-1.0.6.tar.gz /Sphinx-1.0.7.tar.gz -/Sphinx-1.1.2.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 85cd2aa..eaeaf4e 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -5,8 +5,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.1.2 -Release: 1%{?dist} +Version: 1.0.7 +Release: 2%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -152,9 +152,6 @@ make test %changelog -* Mon Nov 28 2011 Toshio Kuratomi - 1.1.2-1 -- Update to upstream 1.1.2 - * Wed Feb 09 2011 Fedora Release Engineering - 1.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index c045db9..a2630fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b65a5d5d6172f3dcfefb4770ec63926e Sphinx-1.1.2.tar.gz +42c722d48e52d4888193965dd473adb5 Sphinx-1.0.7.tar.gz From d840da14a6d10a6e40ccaeb3ca9cfdbdbc9420a7 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 8 Dec 2011 17:20:53 +0100 Subject: [PATCH 2/5] Update to upstream 1.0.8 --- .gitignore | 4 +--- python-sphinx.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0749f5b..a591c09 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/Sphinx-1.0.4.tar.gz -/Sphinx-1.0.6.tar.gz -/Sphinx-1.0.7.tar.gz +/Sphinx-1.0.8.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index eaeaf4e..472df64 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -5,8 +5,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.0.7 -Release: 2%{?dist} +Version: 1.0.8 +Release: 1%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -152,6 +152,9 @@ make test %changelog +* Thu Dec 8 2011 Michel Salim - 1.0.8-1 +- Update to upstream 1.0.8 + * Wed Feb 09 2011 Fedora Release Engineering - 1.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index a2630fe..999fa26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -42c722d48e52d4888193965dd473adb5 Sphinx-1.0.7.tar.gz +6f9aace3f7e523ce55514eafa2764c6f Sphinx-1.0.8.tar.gz From c3dad84138845cd970111e152530190e715ed609 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sat, 17 Dec 2011 15:27:46 +0100 Subject: [PATCH 3/5] Patch for one of the HTML test suite's expected warnings on RHEL6 BR on texlive-latex for LaTeX tests --- Sphinx-1.0.8-el6-htmltest-fixwarning.patch | 11 +++++++++++ python-sphinx.spec | 10 +++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 Sphinx-1.0.8-el6-htmltest-fixwarning.patch diff --git a/Sphinx-1.0.8-el6-htmltest-fixwarning.patch b/Sphinx-1.0.8-el6-htmltest-fixwarning.patch new file mode 100644 index 0000000..7f60602 --- /dev/null +++ b/Sphinx-1.0.8-el6-htmltest-fixwarning.patch @@ -0,0 +1,11 @@ +--- Sphinx-1.0.8/tests/test_build_html.py.el6-htmltest-fixwarning 2011-09-23 09:43:41.000000000 +0200 ++++ Sphinx-1.0.8/tests/test_build_html.py 2011-12-17 15:05:26.948569567 +0100 +@@ -40,7 +40,7 @@ + %(root)s/includes.txt:\\d*: WARNING: Encoding 'utf-8-sig' used for \ + reading included file u'.*?wrongenc.inc' seems to be wrong, try giving an \ + :encoding: option\\n? +-%(root)s/includes.txt:4: WARNING: download file not readable: nonexisting.png ++None:4: WARNING: download file not readable: nonexisting.png + %(root)s/objects.txt:\\d*: WARNING: using old C markup; please migrate to \ + new-style markup \(e.g. c:function instead of cfunction\), see \ + http://sphinx.pocoo.org/domains.html diff --git a/python-sphinx.spec b/python-sphinx.spec index 472df64..dc4be04 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -18,6 +18,8 @@ Group: Development/Tools License: BSD and Public Domain and Python and (MIT or GPLv2) URL: http://sphinx.pocoo.org/ Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz +# on RHEL6, one of the HTML warnings is slightly different +Patch0: %{upstream_name}-1.0.8-el6-htmltest-fixwarning.patch BuildArch: noarch BuildRequires: python2-devel >= 2.4 @@ -25,6 +27,8 @@ 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 @@ -79,6 +83,9 @@ This package contains documentation in reST and HTML formats. %prep %setup -q -n %{upstream_name}-%{version}%{?prerel} +%if 0%{?el6} +%patch0 -p1 -b .el6-htmltest-fixwarning +%endif sed '1d' -i sphinx/pycode/pgen2/token.py %build @@ -152,8 +159,9 @@ make test %changelog -* Thu Dec 8 2011 Michel Salim - 1.0.8-1 +* Sat Dec 17 2011 Michel Salim - 1.0.8-1 - Update to upstream 1.0.8 +- BR on texlive-latex for LaTeX tests * Wed Feb 09 2011 Fedora Release Engineering - 1.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 1e2bd8184afef6ff35e6172f8448f2680874159f Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 27 Apr 2012 10:50:26 -0700 Subject: [PATCH 4/5] Package is retired --- .gitignore | 1 - Sphinx-1.0.8-el6-htmltest-fixwarning.patch | 11 - dead.package | 1 + python-sphinx.spec | 265 --------------------- sources | 1 - 5 files changed, 1 insertion(+), 278 deletions(-) delete mode 100644 .gitignore delete mode 100644 Sphinx-1.0.8-el6-htmltest-fixwarning.patch create mode 100644 dead.package delete mode 100644 python-sphinx.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index a591c09..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/Sphinx-1.0.8.tar.gz diff --git a/Sphinx-1.0.8-el6-htmltest-fixwarning.patch b/Sphinx-1.0.8-el6-htmltest-fixwarning.patch deleted file mode 100644 index 7f60602..0000000 --- a/Sphinx-1.0.8-el6-htmltest-fixwarning.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Sphinx-1.0.8/tests/test_build_html.py.el6-htmltest-fixwarning 2011-09-23 09:43:41.000000000 +0200 -+++ Sphinx-1.0.8/tests/test_build_html.py 2011-12-17 15:05:26.948569567 +0100 -@@ -40,7 +40,7 @@ - %(root)s/includes.txt:\\d*: WARNING: Encoding 'utf-8-sig' used for \ - reading included file u'.*?wrongenc.inc' seems to be wrong, try giving an \ - :encoding: option\\n? --%(root)s/includes.txt:4: WARNING: download file not readable: nonexisting.png -+None:4: WARNING: download file not readable: nonexisting.png - %(root)s/objects.txt:\\d*: WARNING: using old C markup; please migrate to \ - new-style markup \(e.g. c:function instead of cfunction\), see \ - http://sphinx.pocoo.org/domains.html diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..0f98991 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Package is retired diff --git a/python-sphinx.spec b/python-sphinx.spec deleted file mode 100644 index dc4be04..0000000 --- a/python-sphinx.spec +++ /dev/null @@ -1,265 +0,0 @@ -%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.0.8 -Release: 1%{?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) -URL: http://sphinx.pocoo.org/ -Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz -# on RHEL6, one of the HTML warnings is slightly different -Patch0: %{upstream_name}-1.0.8-el6-htmltest-fixwarning.patch - -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 - - -%description -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. - - -%package doc -Summary: Documentation for %{name} -Group: Documentation -License: BSD -Requires: %{name} = %{version}-%{release} - - -%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 -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. - - -%prep -%setup -q -n %{upstream_name}-%{version}%{?prerel} -%if 0%{?el6} -%patch0 -p1 -b .el6-htmltest-fixwarning -%endif -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 .. -popd - - -%install -rm -rf %{buildroot} - -%{__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/ -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 -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 - - -%check -make test - - -%files -f sphinx.lang -%defattr(-,root,root,-) -%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO -%{_bindir}/sphinx-* -%{python_sitelib}/* -%dir %{_datadir}/sphinx/ -%dir %{_datadir}/sphinx/locale -%dir %{_datadir}/sphinx/locale/* -%{_mandir}/man1/* - -%files doc -%defattr(-,root,root,-) -%doc html reST - - -%changelog -* Sat Dec 17 2011 Michel Salim - 1.0.8-1 -- Update to upstream 1.0.8 -- BR on texlive-latex for LaTeX tests - -* Wed Feb 09 2011 Fedora Release Engineering - 1.0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 18 2011 Toshio Kuratomi - 1.0.7-1 -- Update to upstream 1.0.7 - -* Mon Jan 17 2011 Toshio Kuratomi - 1.0.6-1 -- Update to upstream 1.0.6 - -* Mon Nov 1 2010 Michel Salim - 1.0.4-3 -- Fix -doc Makefile to allow regeneration of .rst files - -* Mon Nov 1 2010 Michel Salim - 1.0.4-2 -- Actually include *.js locale files -- Generate manpages - -* Fri Sep 17 2010 Michel Salim - 1.0.4-1 -- Update to 1.0.4 -- Remove BuildRoot and %%clean declarations - -* Thu Jul 22 2010 David Malcolm - 1.0-0.1.b2.1 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Mon May 31 2010 Toshio Kuratomi - 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 - 1.0-0.1.b1 -- Update to 1.0 beta 1 - -* 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 - -* 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. - -* Fri Sep 4 2009 Michel Salim - 0.6.3-1 -- Update to 0.6.3 - -* Mon Aug 17 2009 Toshio Kuratomi - 0.6.2-1 -- Update to 0.6.2 -- upstream bugfix requested inside bz#512438 - -* Sun Jul 26 2009 Fedora Release Engineering - 0.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Jun 05 2009 Luke Macken - 0.6.1-2 -- Add a patch to use our own setuptools package - -* Fri Apr 17 2009 Michel Salim - 0.6.1-1 -- Update to 0.6.1 - -* Thu Feb 26 2009 Fedora Release Engineering - 0.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Jan 2 2009 Michel Salim - 0.5.1-1 -- Update to 0.5.1 - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.5-2 -- Rebuild for Python 2.6 - -* Mon Nov 24 2008 Michel Salim - 0.5-1 -- Update to 0.5 - -* Fri Oct 10 2008 Michel Salim - 0.4.3-1 -- Update to 0.4.3 - -* Wed Aug 27 2008 Toshio Kuratomi - 0.4.2-1.1 -- Fix for EL-5 build. - -* Mon Aug 25 2008 Michel Salim - 0.4.2-1 -- Update to 0.4.2 - -* Mon May 26 2008 Michel Salim - 0.3-1 -- Update to 0.3 - -* Fri May 2 2008 Michel Salim - 0.1.61950-3 -- Split documentation into subpackage -- Exclude C files (not built by default anyway) - -* Wed Apr 16 2008 José Matos - 0.1.61950-2 -- Build html documentation, include it and include the rst - documentation. - -* Thu Mar 27 2008 Michel Salim 0.1.61950-1 -- Initial package diff --git a/sources b/sources deleted file mode 100644 index 999fa26..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -6f9aace3f7e523ce55514eafa2764c6f Sphinx-1.0.8.tar.gz From 2ad62e6fb31bc518224fdad20e73b006da15ab9d Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 27 Apr 2012 10:51:17 -0700 Subject: [PATCH 5/5] Reason: in RHEL6 --- dead.package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dead.package b/dead.package index 0f98991..c6971f3 100644 --- a/dead.package +++ b/dead.package @@ -1 +1 @@ -Package is retired +Package is retired -- sphinx is in RHEL6. Use python-sphinx10 package if you want an updated version