python-sphinx-0.3

.cvsignore

@@ -1 +1 @@
-Sphinx-0.6.4.tar.gz
+Sphinx-0.3.tar.gz

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 $$d/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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

branch

@@ -1 +1 @@
-F-12
+F-9

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

@@ -4,7 +4,7 @@
 %define upstream_name Sphinx
 
 Name:           python-sphinx
-Version:        0.6.4
+Version:        0.3
 Release:        1%{?dist}
 Summary:        Python documentation generator
 
@@ -12,12 +12,11 @@ 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-jinja2 python-setuptools
-Requires:       python-docutils python-jinja2 python-pygments
+BuildRequires:  python-devel python-docutils python-jinja python-setuptools
+Requires:       python-docutils python-jinja python-pygments
 
 
 %description
@@ -50,7 +49,7 @@ the Python docs:
 
 
 %package       doc
-Summary:       Documentation for %{name}
+Summary:       Documentation for ${name}
 Group:         Documentation
 License:       BSD
 Requires:      %{name} = %{version}-%{release}
@@ -69,7 +68,6 @@ This package contains documentation in rST and HTML formats
 
 %prep
 %setup -q -n %{upstream_name}-%{version}
-%patch0 -p0 -b .setuptools
 
 
 %build
@@ -86,22 +84,19 @@ rm -rf $RPM_BUILD_ROOT
 sed -i 's|\r||g' LICENSE
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
-# 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
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGES LICENSE README TODO
 %{_bindir}/sphinx-*
 %{python_sitelib}/sphinx
+%if 0%{?fedora} >= 9
 %{python_sitelib}/*.egg-info
+%endif
 
 %files doc
 %defattr(-,root,root,-)
@@ -109,46 +104,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* 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
-
-* Fri Apr 17 2009 Michel Salim <salimma@fedoraproject.org> - 0.6.1-1
-- Update to 0.6.1
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Jan  2 2009 Michel Salim <salimma@fedoraproject.org> - 0.5.1-1
-- Update to 0.5.1
-
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.5-2
-- Rebuild for Python 2.6
-
-* Mon Nov 24 2008 Michel Salim <salimma@fedoraproject.org> - 0.5-1
-- Update to 0.5
-
-* Fri Oct 10 2008 Michel Salim <salimma@fedoraproject.org> - 0.4.3-1
-- Update to 0.4.3
-
-* Wed Aug 27 2008 Toshio Kuratomi <toshio@fedoraproject.org> - 0.4.2-1.1
-- Fix for EL-5 build.
-
-* Mon Aug 25 2008 Michel Salim <salimma@fedoraproject.org> - 0.4.2-1
-- Update to 0.4.2
-
 * Mon May 26 2008 Michel Salim <salimma@fedoraproject.org> - 0.3-1
 - Update to 0.3
 

sources

@@ -1 +1 @@
-a65e0bcff6f79a7c013220d00ea137ad  Sphinx-0.6.4.tar.gz
+98550d222aec91a029c0921819c4c49f  Sphinx-0.3.tar.gz