- 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
5 changed files with 22 additions and 43 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +0,0 @@
-Sphinx-1.0b2.tar.gz
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+Sphinx-0.6.6.tar.gz
--- a/21
+++ b/21
@@ -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)
--- a/python-sphinx.spec
+++ b/python-sphinx.spec
@@ -3,17 +3,16 @@
 %endif

 %global upstream_name Sphinx
-%global prerel b2

 Name:       python-sphinx
-Version:    1.0
-Release:    %{?prerel:0.}1.%{?prerel}%{?dist}
+Version:    0.6.6
+Release:    3%{?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}%{?prerel}.tar.gz
+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
@@ -75,7 +74,7 @@ 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
@@ -84,7 +83,8 @@ pushd doc
 make html
 rm -rf _build/html/.buildinfo
 mv _build/html ..
-rm -rf _*
+rm -rf _build
+sed -i 's|python ../sphinx-build.py|/usr/bin/sphinx-build|' Makefile
 popd


@@ -94,17 +94,17 @@ rm -rf %{buildroot}
 %{__python} setup.py install --skip-build --root %{buildroot}


-# Manpages not in beta release yet
-#pushd doc
+pushd doc
 # Deliver man pages
-#install -d %{buildroot}%{_mandir}/man1
-#mv sphinx-*.1 %{buildroot}%{_mandir}/man1/
-#popd
+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
+# 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 "`;
@@ -140,9 +140,10 @@ make test
 %doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
 %{_bindir}/sphinx-*
 %{python_sitelib}/*
-%{_datadir}/sphinx/
-%exclude %{_datadir}/sphinx/locale/*/sphinx.js
-#%{_mandir}/man1/*
+%dir %{_datadir}/sphinx/
+%dir %{_datadir}/sphinx/locale
+%dir %{_datadir}/sphinx/locale/*
+%{_mandir}/man1/*

 %files doc
 %defattr(-,root,root,-)
@@ -150,12 +151,11 @@ make test


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

-* Wed May 26 2010 Michel Salim <salimma@fedoraproject.org> - 1.0-0.1.b1
- Update to 1.0 beta 1
+* Mon Nov  1 2010 Michel Salim <salimma@fedoraproject.org> - 0.6.6-2
+- Actually include *.js locale files

 * Tue May 25 2010 Michel Salim <salimma@fedoraproject.org> - 0.6.6-1
 - Update to 0.6.6
--- a/2
+++ b/2
@@ -1 +1 @@
-6bf13da4fd0542cc85705d1c4abd3c0a  Sphinx-1.0b2.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