- Fix -doc Makefile to allow regeneration of .rst files

note that patch to support locale files in %{_datadir} has been upstreamed
since 0.6.6
2010-11-01 23:59:18 +01:00 · 2010-11-01 20:21:39 +01:00 · 2010-11-01 18:51:47 +01:00 · 2010-07-29 10:43:40 +00:00 · 2010-05-25 22:35:09 +00:00 · 2010-05-22 01:22:47 +00:00
3 changed files with 16 additions and 50 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/Sphinx-1.0.8.tar.gz
+Sphinx-0.6.6.tar.gz
--- a/python-sphinx.spec
+++ b/python-sphinx.spec
@@ -5,29 +5,22 @@
 %global upstream_name Sphinx

 Name:       python-sphinx
-Version:    1.0.8
-Release:    2%{?dist}
+Version:    0.6.6
+Release:    3%{?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

+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 +74,17 @@ This package contains documentation in reST and HTML formats.


 %prep
-%setup -q -n %{upstream_name}-%{version}%{?prerel}
+%setup -q -n %{upstream_name}-%{version}
 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 _build
+sed -i 's|python ../sphinx-build.py|/usr/bin/sphinx-build|' Makefile
 popd


@@ -103,12 +97,10 @@ 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;
@@ -135,6 +127,10 @@ popd
  >> sphinx.lang


+%clean
+rm -rf %{buildroot}
+
+
 %check
 make test

@@ -155,41 +151,11 @@ 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
+* Mon Nov  1 2010 Michel Salim <salimma@fedoraproject.org> - 0.6.6-3
 - Fix -doc Makefile to allow regeneration of .rst files

-* Mon Nov  1 2010 Michel Salim <salimma@fedoraproject.org> - 1.0.4-2
+* Mon Nov  1 2010 Michel Salim <salimma@fedoraproject.org> - 0.6.6-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
--- a/2
+++ b/2
@@ -1 +1 @@
-6f9aace3f7e523ce55514eafa2764c6f  Sphinx-1.0.8.tar.gz
+840f6dbbecbb4979a204909f5656c723  Sphinx-0.6.6.tar.gz
Author	SHA1	Message	Date
Michel Alexandre Salim	d04df2ff68	- Fix -doc Makefile to allow regeneration of .rst files	2010-11-01 23:59:18 +01:00
Michel Alexandre Salim	5898dacc7f	note that patch to support locale files in %{_datadir} has been upstreamed since 0.6.6	2010-11-01 20:21:39 +01:00
Michel Alexandre Salim	8cad736d24	- Actually include *.js locale files	2010-11-01 18:51:47 +01:00
Fedora Release Engineering	1cc1313cde	dist-git conversion	2010-07-29 10:43:40 +00:00
Michel Alexandre Salim	521b3da51b	- Update to 0.6.6	2010-05-25 22:35:09 +00:00
Toshio くらとみ	7344924605	- 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	2010-05-22 01:22:47 +00:00
Jesse Keating	10a9360727	Initialize branch F-13 for python-sphinx	2010-02-17 02:58:24 +00:00