rpms/python-djblets/EL-5 FED01-Disable-ez_setup-when-installing-by-RPM.patch, NONE, 1.1 python-djblets.spec, 1.6, 1.7

[Stephen Gallagher]

Author: sgallagh

Update of /cvs/pkgs/rpms/python-djblets/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16835

Modified Files:
	python-djblets.spec 
Added Files:
	FED01-Disable-ez_setup-when-installing-by-RPM.patch 
Log Message:
* Mon Jul 06 2010 Stephen Gallagher <sgallagh at redhat.com> 0.6.3-7
- Added utility functions for HTTP Accept-based content negotation.
- Add some gravy to make sites work better on iphone/ipad Safari
- Required for ReviewBoard 1.5rc1 and later


FED01-Disable-ez_setup-when-installing-by-RPM.patch:
 setup.py |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE FED01-Disable-ez_setup-when-installing-by-RPM.patch ---
>From 2241e887203af795cbee92cca1ecae104e59ae65 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh at redhat.com>
Date: Tue, 6 Jul 2010 07:04:04 -0400
Subject: [PATCH] Disable ez_setup when installing by RPM

---
 setup.py |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index d3952b802298a47d1d8f1d6e42a8a37a91c891f5..205cd3b029fa16a29552a9abd16685e9d0bf3966 100755
--- a/setup.py
+++ b/setup.py
@@ -24,9 +24,6 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-from ez_setup import use_setuptools
-use_setuptools()
-
 from setuptools import setup, find_packages
 
 from setuptools.command.test import test
-- 
1.7.1



Index: python-djblets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-djblets/EL-5/python-djblets.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-djblets.spec	4 Jun 2010 18:22:58 -0000	1.6
+++ python-djblets.spec	6 Jul 2010 11:29:14 -0000	1.7
@@ -4,8 +4,8 @@
 %endif
 
 Name:           python-djblets
-Version:        0.6.2
-Release:        6%{?dist}
+Version:        0.6.3
+Release:        7%{?dist}
 Summary:        A collection of useful classes and functions for Django
 Group:          Applications/Internet
 # Djblets is MIT licensed:
@@ -15,7 +15,7 @@ Group:          Applications/Internet
 # https://www.redhat.com/archives/fedora-legal-list/2009-May/msg00025.html
 License:        MIT and (MIT or GPLv2)
 URL:            http://www.review-board.org
-Source0:        http://downloads.review-board.org/releases/Djblets/0.5/Djblets-%{version}.tar.gz
+Source0:        http://downloads.review-board.org/releases/Djblets/0.6/Djblets-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python
@@ -24,13 +24,15 @@ BuildRequires:  python-setuptools
 Requires:       Django >= 1.1.1
 Requires:       python-imaging
 
+Patch1000: FED01-Disable-ez_setup-when-installing-by-RPM.patch
+
 %description
 A collection of useful classes and functions for Django
 
 %prep
 %setup -q -n Djblets-%{version}
-sed -i 's/^from ez_setup/#from ez_setup/' setup.py
-sed -i 's/^use_setuptools()/#use_setuptools()/' setup.py
+%patch1000 -p1
+
 %build
 %{__python} setup.py build
 
@@ -56,6 +58,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/djblets/
 
 %changelog
+* Mon Jul 06 2010 Stephen Gallagher <sgallagh at redhat.com> 0.6.3-7
+- Added utility functions for HTTP Accept-based content negotation.
+- Add some gravy to make sites work better on iphone/ipad Safari
+- Required for ReviewBoard 1.5rc1 and later
+
 * Fri May 14 2010 Stephen Gallagher <sgallagh at redhat.com> 0.6.2-6
 - Fixed rendering issues with columns in the datagrids
 - Fixed over-caching of columns