[protobuf/el6/master] Removing ez_setup

[derks]

commit af5acd4febc4328d3ff249bd96a0ee9e4f2e04f9
Author: BJ Dierkes <wdierkes at 5dollarwhitebox.org>
Date:   Thu Jan 20 16:12:22 2011 -0600

    Removing ez_setup

 protobuf-2.3.0-ez_setup.patch |   13 +++++++++++++
 protobuf.spec                 |    8 +++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/protobuf-2.3.0-ez_setup.patch b/protobuf-2.3.0-ez_setup.patch
new file mode 100644
index 0000000..bd1122c
--- /dev/null
+++ b/protobuf-2.3.0-ez_setup.patch
@@ -0,0 +1,13 @@
+--- protobuf-2.3.0/python/setup.py.orig	2010-01-08 13:20:15.000000000 -0600
++++ protobuf-2.3.0/python/setup.py	2011-01-20 16:07:59.547707352 -0600
+@@ -4,8 +4,8 @@
+ 
+ # We must use setuptools, not distutils, because we need to use the
+ # namespace_packages option for the "google" package.
+-from ez_setup import use_setuptools
+-use_setuptools()
++#from ez_setup import use_setuptools
++#use_setuptools()
+ 
+ from setuptools import setup
+ from distutils.spawn import find_executable
diff --git a/protobuf.spec b/protobuf.spec
index 4b06d01..a4d8199 100644
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -19,7 +19,7 @@
 Summary:        Protocol Buffers - Google's data interchange format
 Name:           protobuf
 Version:        2.3.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        BSD
 Group:          Development/Libraries
 Source:         http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2
@@ -27,6 +27,7 @@ Source1:        ftdetect-proto.vim
 Patch1:         protobuf-2.3.0-fedora-gtest.patch
 Patch2:         protobuf-java-fixes.patch
 Patch3:         protobuf-2.2.0-libtool.patch
+Patch4:         protobuf-2.3.0-ez_setup.patch
 URL:            http://code.google.com/p/protobuf/
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  libtool pkgconfig 
@@ -196,6 +197,7 @@ chmod 644 examples/*
 rm -rf java/src/test
 %endif
 %patch3 -p1 -b .libtool
+%patch4 -p1 -b .ez_setup
 
 %build
 iconv -f iso8859-1 -t utf-8 CONTRIBUTORS.txt > CONTRIBUTORS.txt.utf8
@@ -344,6 +346,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Thu Jan 20 2011 BJ Dierkes <wdierkes at rackspace.com> - 2.3.0-7
+- Added Patch4: protobuf-2.3.0-ez_setup.patch (don't use ez_setup
+  as it tries to download setuptools)
+
 * Tue Jan 18 2011 BJ Dierkes <wdierkes at rackspace.com> - 2.3.0-6
 - Add Group: Development/Libraries to -lite-devel package
 - BuildRequires: python-setuptools on EL5 (not python-setuptools-devel)