Remove leftover line from git merge

.gitignore

@@ -1,3 +1 @@
-/Sphinx-1.0.4.tar.gz
+/Sphinx-1.0.8.tar.gz
-/Sphinx-1.0.6.tar.gz
-/Sphinx-1.0.7.tar.gz

python-sphinx.spec

@@ -5,8 +5,8 @@
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-Version:    1.0.7
+Version:    1.0.8
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Python documentation generator
 
 Group:      Development/Tools
@@ -25,6 +25,9 @@ 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
@@ -152,6 +155,15 @@ 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
 

sources

@@ -1 +1 @@
-42c722d48e52d4888193965dd473adb5  Sphinx-1.0.7.tar.gz
+6f9aace3f7e523ce55514eafa2764c6f  Sphinx-1.0.8.tar.gz