- 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
4 changed files with 14 additions and 27 deletions
--- a/.gitignore
+++ b/.gitignore
--- 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/1
+++ b/1
@@ -1 +0,0 @@
-F-13
--- a/python-sphinx.spec
+++ b/python-sphinx.spec
@@ -6,7 +6,7 @@

 Name:       python-sphinx
 Version:    0.6.6
-Release:    1%{?dist}
+Release:    3%{?dist}
 Summary:    Python documentation generator

 Group:      Development/Tools
@@ -83,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


@@ -102,7 +103,8 @@ 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 "`;
@@ -138,8 +140,9 @@ make test
 %doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
 %{_bindir}/sphinx-*
 %{python_sitelib}/*
-%{_datadir}/sphinx/
-%exclude %{_datadir}/sphinx/locale/*/sphinx.js
+%dir %{_datadir}/sphinx/
+%dir %{_datadir}/sphinx/locale
+%dir %{_datadir}/sphinx/locale/*
 %{_mandir}/man1/*

 %files doc
@@ -148,6 +151,12 @@ make test


 %changelog
+* 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> - 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
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