From d8653f49d0ca9316c735c11f39febd0c3c01bb01 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 5 Apr 2012 23:22:38 +0700 Subject: [PATCH 1/3] Update to upstream 1.0.8 --- .gitignore | 4 +--- python-sphinx.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0749f5b..a591c09 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/Sphinx-1.0.4.tar.gz -/Sphinx-1.0.6.tar.gz -/Sphinx-1.0.7.tar.gz +/Sphinx-1.0.8.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index eaeaf4e..1424cc9 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -5,8 +5,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.0.7 -Release: 2%{?dist} +Version: 1.0.8 +Release: 1%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -152,6 +152,9 @@ make test %changelog +* Thu Apr 5 2012 Michel Salim - 1.0.8-1 +- Update to upstream 1.0.8 + * Wed Feb 09 2011 Fedora Release Engineering - 1.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index a2630fe..999fa26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -42c722d48e52d4888193965dd473adb5 Sphinx-1.0.7.tar.gz +6f9aace3f7e523ce55514eafa2764c6f Sphinx-1.0.8.tar.gz From 38234d32ab310fcfb875d9b16a621d4e42584285 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sat, 17 Dec 2011 15:27:46 +0100 Subject: [PATCH 2/3] BR on texlive-latex for LaTeX tests --- python-sphinx.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 1424cc9..5742275 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -6,7 +6,7 @@ Name: python-sphinx 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,10 @@ make test %changelog +<<<<<<< HEAD +* Thu Apr 5 2012 Michel Salim - 1.0.8-2 +- BR on texlive-latex for LaTeX tests + * Thu Apr 5 2012 Michel Salim - 1.0.8-1 - Update to upstream 1.0.8 From 1d16dec8032f3668864554a20d1f7dc4bd6cdd58 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 5 Apr 2012 23:41:16 +0700 Subject: [PATCH 3/3] Remove leftover line from git merge --- python-sphinx.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-sphinx.spec b/python-sphinx.spec index 5742275..af96bf1 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -155,7 +155,6 @@ make test %changelog -<<<<<<< HEAD * Thu Apr 5 2012 Michel Salim - 1.0.8-2 - BR on texlive-latex for LaTeX tests