SPECS: python-genshi.spec - fix without speedups build

[glen]

Author: glen                         Date: Wed Aug  6 17:37:28 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix without speedups build

---- Files affected:
SPECS:
   python-genshi.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/python-genshi.spec
diff -u SPECS/python-genshi.spec:1.2 SPECS/python-genshi.spec:1.3
--- SPECS/python-genshi.spec:1.2	Wed Aug  6 19:28:37 2008
+++ SPECS/python-genshi.spec	Wed Aug  6 19:37:23 2008
@@ -19,11 +19,14 @@
 # Source0-md5:	822942bbc3109da9f6b472eb8ea4e3a4
 URL:		http://genshi.edgewall.org/
 BuildRequires:	python-devel
+BuildRequires:	python-setuptools
 BuildRequires:	rpm-pythonprov
-BuildRequires:	python-setuptools-devel
 BuildRequires:	rpmbuild(macros) >= 1.219
+%{!?with_speedups:BuildArch:	noarch}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%{!?with_speedups:%{expand:%%global py_sitedir %{py_sitescriptdir}}}
+
 %description
 Genshi is a Python library that provides an integrated set of
 components for parsing, generating, and processing HTML, XML or other
@@ -39,10 +42,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install \
-	--optimize=2 \
-	--skip-build \
+%{__python} setup.py \
 	%{!?with_speedups:--without-speedups} \
+	install \
+	--optimize=2 \
 	--root=$RPM_BUILD_ROOT
 
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
@@ -55,6 +58,7 @@
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog
+
 %{py_sitedir}/genshi/*.py[co]
 %dir %{py_sitedir}/genshi/filters
 %{py_sitedir}/genshi/filters/*.py[co]
@@ -65,7 +69,7 @@
 %attr(755,root,root) %{py_sitedir}/genshi/_speedups.so
 %endif
 
-# egg info is built with py 2.4 too
+# egg-info is built with setuptools under py 2.4 too
 %{py_sitedir}/Genshi-*.egg-info
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -74,6 +78,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2008/08/06 17:37:23  glen
+- fix without speedups build
+
 Revision 1.2  2008/08/06 17:28:37  glen
 - speedups bcond, cflags
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/python-genshi.spec?r1=1.2&r2=1.3&f=u