- Update to 1.0 beta 1

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

.cvsignore

@@ -0,0 +1 @@
+Sphinx-1.0b1.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 b1
 
 Name:       python-sphinx
-Version:    0.6.6
-Release:    1%{?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
@@ -93,11 +94,12 @@ 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
@@ -140,7 +142,7 @@ make test
 %{python_sitelib}/*
 %{_datadir}/sphinx/
 %exclude %{_datadir}/sphinx/locale/*/sphinx.js
-%{_mandir}/man1/*
+#%{_mandir}/man1/*
 
 %files doc
 %defattr(-,root,root,-)
@@ -148,6 +150,9 @@ make test
 
 
 %changelog
+* 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
+efe4e95ea02e1a7fbb19969632454f3f  Sphinx-1.0b1.tar.gz