- Update to 1.0 beta 2

- Fixes problem building html documentation in non-English locales

.cvsignore

@@ -0,0 +1 @@
+Sphinx-1.0b2.tar.gz

.gitignore

@@ -1 +0,0 @@
-Sphinx-0.6.6.tar.gz

Makefile

@@ -0,0 +1,21 @@
+# 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)

python-sphinx.spec

@@ -3,16 +3,17 @@
 %endif
 
 %global upstream_name Sphinx
+%global prerel b2
 
 Name:       python-sphinx
-Version:    0.6.6
-Release:    3%{?dist}
+Version:    1.0
+Release:    %{?prerel:0.}1.%{?prerel}%{?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
+Source0:    http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}%{?prerel}.tar.gz
 
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:     noarch
@@ -74,7 +75,7 @@ This package contains documentation in reST and HTML formats.
 
 
 %prep
-%setup -q -n %{upstream_name}-%{version}
+%setup -q -n %{upstream_name}-%{version}%{?prerel}
 sed '1d' -i sphinx/pycode/pgen2/token.py
 
 %build
@@ -83,8 +84,7 @@ pushd doc
 make html
 rm -rf _build/html/.buildinfo
 mv _build/html ..
-rm -rf _build
-sed -i 's|python ../sphinx-build.py|/usr/bin/sphinx-build|' Makefile
+rm -rf _*
 popd
 
 
@@ -94,17 +94,17 @@ rm -rf %{buildroot}
 %{__python} setup.py install --skip-build --root %{buildroot}
 
 
-pushd doc
+# Manpages not in beta release yet
+#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;
-# patch to support this incorporated in 0.6.6
+# 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 "`;
@@ -140,10 +140,9 @@ make test
 %doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
 %{_bindir}/sphinx-*
 %{python_sitelib}/*
-%dir %{_datadir}/sphinx/
-%dir %{_datadir}/sphinx/locale
-%dir %{_datadir}/sphinx/locale/*
-%{_mandir}/man1/*
+%{_datadir}/sphinx/
+%exclude %{_datadir}/sphinx/locale/*/sphinx.js
+#%{_mandir}/man1/*
 
 %files doc
 %defattr(-,root,root,-)
@@ -151,11 +150,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 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-2
-- Actually include *.js locale files
+* 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

sources

@@ -1 +1 @@
-840f6dbbecbb4979a204909f5656c723  Sphinx-0.6.6.tar.gz
+6bf13da4fd0542cc85705d1c4abd3c0a  Sphinx-1.0b2.tar.gz