rpms/python-cherrypy/EL-5 python-cherrypy.spec,1.14,1.15

[Toshio くらとみ (toshio)]

Author: toshio

Update of /cvs/pkgs/rpms/python-cherrypy/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30344

Modified Files:
	python-cherrypy.spec 
Log Message:

* Thu Jan 22 2008 Toshio Kuratomi <toshio at fedoraproject.org> 2.2.1-9
- Add egg-info so that the new TurboGears can build against cherrypy on F-7
  and F-8 as well as Rawhide.



Index: python-cherrypy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy/EL-5/python-cherrypy.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- python-cherrypy.spec	6 Jan 2008 19:10:44 -0000	1.14
+++ python-cherrypy.spec	23 Jan 2008 06:13:30 -0000	1.15
@@ -2,12 +2,12 @@
 
 Name:           python-cherrypy
 Version:        2.2.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A pythonic, object-oriented web development framework
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.cherrypy.org/
-Source0:        http://dl.sf.net/cherrypy/CherryPy-%{version}.tar.gz
+Source0:        http://download.cherrypy.org/cherrypy/%{version}/CherryPy-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         %{name}-tutorial-doc.patch
 Patch1:         %{name}-regression-test.patch
@@ -17,6 +17,11 @@
 BuildArch:      noarch
 
 BuildRequires:  python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 
 %description
 CherryPy allows developers to build web applications in much the same way 
@@ -33,11 +38,11 @@
 %{__sed} -i 's/\r//' CHANGELOG.txt README.txt CHERRYPYTEAM.txt cherrypy/tutorial/README.txt
 
 %build
-%{__python} setup.py build
+%{__python} -c 'import setuptools; execfile("setup.py")' build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --prefix=%{_prefix}
+%{__python} -c 'import setuptools; execfile("setup.py")' install -O1 --skip-build --root %{buildroot}
 
 #%check
 #cd cherrypy/test
@@ -53,6 +58,10 @@
 %{python_sitelib}/*
 
 %changelog
+* Thu Jan 22 2008 Toshio Kuratomi <toshio at fedoraproject.org> 2.2.1-9
+- Add egg-info so that the new TurboGears can build against cherrypy on F-7
+  and F-8 as well as Rawhide.
+
 * Sun Jan  6 2008 Toshio Kuratomi <toshio at fedoraproject.org> 2.2.1-8
 - Fix a security bug with a backport of http://www.cherrypy.org/changeset/1775
 - Include the egginfo files as well as the python files.