rpms/python-sphinx/devel python-sphinx-setuptools.patch, NONE, 1.1 python-sphinx.spec, 1.11, 1.12

Luke Macken lmacken at fedoraproject.org
Fri Jun 5 15:56:56 UTC 2009


Author: lmacken

Update of /cvs/pkgs/rpms/python-sphinx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22294

Modified Files:
	python-sphinx.spec 
Added Files:
	python-sphinx-setuptools.patch 
Log Message:
Add a patch to use our own setuptools package

python-sphinx-setuptools.patch:

--- NEW FILE python-sphinx-setuptools.patch ---
--- 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


Index: python-sphinx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-sphinx/devel/python-sphinx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- python-sphinx.spec	17 Apr 2009 19:44:05 -0000	1.11
+++ python-sphinx.spec	5 Jun 2009 15:56:25 -0000	1.12
@@ -5,13 +5,14 @@
 
 Name:           python-sphinx
 Version:        0.6.1
-Release:        1%{?dist}
+Release:        2%{?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
@@ -68,6 +69,7 @@ This package contains documentation in r
 
 %prep
 %setup -q -n %{upstream_name}-%{version}
+%patch0 -p0 -b .setuptools
 
 
 %build
@@ -107,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jun 05 2009 Luke Macken <lmacken at redhat.com> - 0.6.1-2
+- Add a patch to use our own setuptools package
+
 * Fri Apr 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.6.1-1
 - Update to 0.6.1
 




More information about the fedora-extras-commits mailing list