From 0fb7e12c235045d67df21dd25e7f2235f94e0f07 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 06:16:41 +0000 Subject: [PATCH 1/6] Initialize branch F-11 for python-sphinx --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 8353038617de1a5fdc4ed5338b6714bbd907f44f Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 20 Aug 2009 05:46:16 +0000 Subject: [PATCH 2/6] - Update to 0.6.2 -- upstream bugfix requested inside bz#512438 --- .cvsignore | 2 +- python-sphinx.spec | 19 +++++++++++++++---- sources | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1bf367a..d3096ec 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Sphinx-0.5.1.tar.gz +Sphinx-0.6.2.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index a180df6..1c2dffd 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -4,19 +4,20 @@ %define upstream_name Sphinx Name: python-sphinx -Version: 0.5.1 -Release: 2%{?dist} +Version: 0.6.2 +Release: 1%{?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) BuildArch: noarch -BuildRequires: python-devel python-docutils python-jinja python-setuptools -Requires: python-docutils python-jinja python-pygments +BuildRequires: python-devel python-docutils python-jinja2 python-setuptools +Requires: python-docutils python-jinja2 python-pygments %description @@ -68,6 +69,7 @@ This package contains documentation in rST and HTML formats %prep %setup -q -n %{upstream_name}-%{version} +%patch0 -p0 -b .setuptools %build @@ -107,6 +109,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 17 2009 Toshio Kuratomi - 0.6.2-1 +- Update to 0.6.2 -- upstream bugfix requested inside bz#512438 + +* Fri Jun 05 2009 Luke Macken - 0.6.1-2 +- Add a patch to use our own setuptools package + +* Fri Apr 17 2009 Michel Salim - 0.6.1-1 +- Update to 0.6.1 + * Thu Feb 26 2009 Fedora Release Engineering - 0.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index f90f6b5..66342c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -11456e362d75c1a4c5a5847921d3f4c7 Sphinx-0.5.1.tar.gz +c8f79e171addc73342cc2e775dc78880 Sphinx-0.6.2.tar.gz From 8571b9bd3dd5a37f8cc65792828717d9fda633eb Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 20 Aug 2009 06:03:03 +0000 Subject: [PATCH 3/6] Include patch for F-11 branch --- python-sphinx-setuptools.patch | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 python-sphinx-setuptools.patch diff --git a/python-sphinx-setuptools.patch b/python-sphinx-setuptools.patch new file mode 100644 index 0000000..c4cfb6a --- /dev/null +++ b/python-sphinx-setuptools.patch @@ -0,0 +1,9 @@ +--- 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 From 24df39f7cdbc141d2869bc8c699ba73d81d84e9b Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Fri, 4 Sep 2009 05:27:41 +0000 Subject: [PATCH 4/6] - Update to 0.6.3 --- .cvsignore | 2 +- python-sphinx.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index d3096ec..f877c40 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Sphinx-0.6.2.tar.gz +Sphinx-0.6.3.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 1c2dffd..5aba7da 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -4,7 +4,7 @@ %define upstream_name Sphinx Name: python-sphinx -Version: 0.6.2 +Version: 0.6.3 Release: 1%{?dist} Summary: Python documentation generator @@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 4 2009 Michel Salim - 0.6.3-1 +- Update to 0.6.3 + * Mon Aug 17 2009 Toshio Kuratomi - 0.6.2-1 - Update to 0.6.2 -- upstream bugfix requested inside bz#512438 diff --git a/sources b/sources index 66342c7..5354ced 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c8f79e171addc73342cc2e775dc78880 Sphinx-0.6.2.tar.gz +b8ba063eeeaf818a7ea07fd28d9614a9 Sphinx-0.6.3.tar.gz From 20fdada60270c5194b1b571d6e006b4fd259c1c0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:55:27 +0000 Subject: [PATCH 5/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b609317..be369c3 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +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)) From 3f33b9fe61c0c5c0b639580905d3b594cdc7090b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Wed, 13 Jan 2010 19:34:36 +0000 Subject: [PATCH 6/6] - Update to 0.6.4 - Fixes a problem using autodoc with pylons projects. --- .cvsignore | 2 +- python-sphinx.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index f877c40..ab16ecd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Sphinx-0.6.3.tar.gz +Sphinx-0.6.4.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 5aba7da..33f73ae 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -4,7 +4,7 @@ %define upstream_name Sphinx Name: python-sphinx -Version: 0.6.3 +Version: 0.6.4 Release: 1%{?dist} Summary: Python documentation generator @@ -109,12 +109,19 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 13 2010 Toshio Kuratomi - 0.6.4-1 +- Update to 0.6.4 +- Fixes a problem using autodoc with pylons projects. + * Fri Sep 4 2009 Michel Salim - 0.6.3-1 - Update to 0.6.3 * Mon Aug 17 2009 Toshio Kuratomi - 0.6.2-1 - Update to 0.6.2 -- upstream bugfix requested inside bz#512438 +* Sun Jul 26 2009 Fedora Release Engineering - 0.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri Jun 05 2009 Luke Macken - 0.6.1-2 - Add a patch to use our own setuptools package diff --git a/sources b/sources index 5354ced..ad5c2c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8ba063eeeaf818a7ea07fd28d9614a9 Sphinx-0.6.3.tar.gz +a65e0bcff6f79a7c013220d00ea137ad Sphinx-0.6.4.tar.gz