Remove leftover line from git merge

since 0.6.6

.cvsignore

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

.gitignore

@@ -0,0 +1 @@
+/Sphinx-1.0.8.tar.gz

Makefile

@@ -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 $$/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-setuptools.patch

@@ -1,9 +0,0 @@
---- setup.py.orig	2009-06-05 07:42:36.000000000 -0400
-+++ setup.py	2009-06-05 07:42:40.000000000 -0400
-@@ -1,6 +1,4 @@
- # -*- coding: utf-8 -*-
--import ez_setup
--ez_setup.use_setuptools()
- 
- import os
- import sys

python-sphinx.spec

@@ -1,23 +1,36 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%endif
 
-%define upstream_name Sphinx
+%global upstream_name Sphinx
 
-Name:           python-sphinx
-Version:        0.6.1
-Release:        2%{?dist}
-Summary:        Python documentation generator
+Name:       python-sphinx
+Version:    1.0.8
+Release:    2%{?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
-Patch0:         %{name}-setuptools.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Group:      Development/Tools
 
-BuildArch:      noarch
-BuildRequires:  python-devel python-docutils python-jinja2 python-setuptools
-Requires:       python-docutils python-jinja2 python-pygments
+# 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)
+URL:        http://sphinx.pocoo.org/
+Source0:    http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
+
+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
 
 
 %description
@@ -49,14 +62,14 @@ the Python docs:
       snippets and inclusion of appropriately formatted docstrings.
 
 
-%package       doc
-Summary:       Documentation for %{name}
-Group:         Documentation
-License:       BSD
-Requires:      %{name} = %{version}-%{release}
+%package doc
+Summary:    Documentation for %{name}
+Group:      Documentation
+License:    BSD
+Requires:   %{name} = %{version}-%{release}
 
 
-%description   doc
+%description doc
 Sphinx is a tool that makes it easy to create intelligent and
 beautiful documentation for Python projects (or other documents
 consisting of multiple reStructuredText sources), written by Georg
@@ -64,51 +77,150 @@ Brandl. It was originally created to translate the new Python
 documentation, but has now been cleaned up in the hope that it will be
 useful to many other projects.
 
-This package contains documentation in rST and HTML formats
+This package contains documentation in reST and HTML formats.
 
 
 %prep
-%setup -q -n %{upstream_name}-%{version}
-%patch0 -p0 -b .setuptools
-
+%setup -q -n %{upstream_name}-%{version}%{?prerel}
+sed '1d' -i sphinx/pycode/pgen2/token.py
 
 %build
 %{__python} setup.py build
-cd doc
+pushd doc
 make html
+make man
+rm -rf _build/html/.buildinfo
 mv _build/html ..
-rm -rf _*
+popd
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-# Fix EOL delimiters
-sed -i 's|\r||g' LICENSE
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-# Language files; not under /usr/share, need to be handled manually
-(cd $RPM_BUILD_ROOT && find . -name 'sphinx.mo') | sed -e 's|^.||' | sed -e \
-  's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
-  >> %{name}.lang
+%{__python} setup.py install --skip-build --root %{buildroot}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+pushd doc
+# Deliver man pages
+install -d %{buildroot}%{_mandir}/man1
+mv _build/man/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;
+# 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 "`;
+do
+  install -d %{buildroot}%{_datadir}/sphinx/locale/$lang
+  install -d %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES
+  mv sphinx/locale/$lang/LC_MESSAGES/sphinx.js \
+     %{buildroot}%{_datadir}/sphinx/locale/$lang/
+  mv sphinx/locale/$lang/LC_MESSAGES/sphinx.mo \
+    %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/
+  rm -rf sphinx/locale/$lang
+done
+popd
+%find_lang sphinx
+
+# Language files; Since these are javascript, it's not immediately obvious to
+# find_lang that they need to be marked with a language.
+(cd %{buildroot} && find . -name 'sphinx.js') | sed -e 's|^.||' | sed -e \
+  's:\(.*/locale/\)\([^/_]\+\)\(.*\.js$\):%lang(\2) \1\2\3:' \
+  >> sphinx.lang
 
 
-%files -f %{name}.lang
+%check
+make test
+
+
+%files -f sphinx.lang
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGES LICENSE README TODO
+%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
 %{_bindir}/sphinx-*
-%{python_sitelib}/sphinx
-%{python_sitelib}/*.egg-info
+%{python_sitelib}/*
+%dir %{_datadir}/sphinx/
+%dir %{_datadir}/sphinx/locale
+%dir %{_datadir}/sphinx/locale/*
+%{_mandir}/man1/*
 
 %files doc
 %defattr(-,root,root,-)
-%doc doc html
+%doc html reST
 
 
 %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
+- Fix -doc Makefile to allow regeneration of .rst files
+
+* Mon Nov  1 2010 Michel Salim <salimma@fedoraproject.org> - 1.0.4-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
+
+* Fri May 21 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.5-2
+- 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
+
+* Wed Jan 13 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.4-1
+- Update to 0.6.4
+- Fixes a problem using autodoc with pylons projects.
+
+* Fri Sep  4 2009 Michel Salim <salimma@fedoraproject.org> - 0.6.3-1
+- Update to 0.6.3
+
+* Mon Aug 17 2009 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.2-1
+- Update to 0.6.2 -- upstream bugfix requested inside bz#512438
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jun 05 2009 Luke Macken <lmacken@redhat.com> - 0.6.1-2
 - Add a patch to use our own setuptools package
 

sources

@@ -1 +1 @@
-fa1a32c406232a96a776de7dfae15032  Sphinx-0.6.1.tar.gz
+6f9aace3f7e523ce55514eafa2764c6f  Sphinx-1.0.8.tar.gz