Remove leftover line from git merge

since 0.6.6

.gitignore

@@ -1 +1 @@
-Sphinx-0.6.6.tar.gz
+/Sphinx-1.0.8.tar.gz

python-sphinx.spec

@@ -5,22 +5,29 @@
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-Version:    0.6.6
+Version:    1.0.8
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Python documentation generator
 
 Group:      Development/Tools
-License:    BSD
+
+# 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
 
-BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 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
@@ -74,16 +81,16 @@ 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
 %{__python} setup.py build
 pushd doc
 make html
+make man
 rm -rf _build/html/.buildinfo
 mv _build/html ..
-rm -rf _*
 popd
 
 
@@ -96,13 +103,16 @@ rm -rf %{buildroot}
 pushd doc
 # Deliver man pages
 install -d %{buildroot}%{_mandir}/man1
-mv sphinx-*.1 %{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 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 "`;
@@ -125,10 +135,6 @@ popd
   >> sphinx.lang
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %check
 make test
 
@@ -138,8 +144,9 @@ make test
 %doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
 %{_bindir}/sphinx-*
 %{python_sitelib}/*
-%{_datadir}/sphinx/
+%dir %{_datadir}/sphinx/
-%exclude %{_datadir}/sphinx/locale/*/sphinx.js
+%dir %{_datadir}/sphinx/locale
+%dir %{_datadir}/sphinx/locale/*
 %{_mandir}/man1/*
 
 %files doc
@@ -148,6 +155,42 @@ make test
 
 
 %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
 

sources

@@ -1 +1 @@
-840f6dbbecbb4979a204909f5656c723  Sphinx-0.6.6.tar.gz
+6f9aace3f7e523ce55514eafa2764c6f  Sphinx-1.0.8.tar.gz