SPECS: buildbot.spec - noarch, egg-info created on py2.4 too, fix duplicate...

glen glen at pld-linux.org
Tue Apr 14 07:54:11 CEST 2009


Author: glen                         Date: Tue Apr 14 05:54:11 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- noarch, egg-info created on py2.4 too, fix duplicate files

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

---- Diffs:

================================================================
Index: SPECS/buildbot.spec
diff -u SPECS/buildbot.spec:1.2 SPECS/buildbot.spec:1.3
--- SPECS/buildbot.spec:1.2	Fri Jan 30 19:57:19 2009
+++ SPECS/buildbot.spec	Tue Apr 14 07:54:05 2009
@@ -9,7 +9,7 @@
 # Source0-md5:	616c193a2508935499f26bcbfc56c08a
 Patch0:		%{name}-fixes.patch
 URL:		http://www.buildbot.net/
-BuildRequires:	python-devel >= 1:2.5
+BuildRequires:	python-devel
 BuildRequires:	rpmbuild(macros) >= 1.219
 %pyrequires_eq	python-modules
 Requires:	python-TwistedConch
@@ -17,6 +17,7 @@
 Requires:	python-TwistedMail
 Requires:	python-TwistedWeb
 Requires:	python-TwistedWords
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,12 +39,11 @@
 %patch0 -p1
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-python setup.py install \
+%{__python} setup.py install \
 	--root=$RPM_BUILD_ROOT \
 	--optimize=2
 %py_postclean
@@ -56,9 +56,8 @@
 %doc CREDITS NEWS README docs/*.html docs/examples docs/images
 %doc contrib
 %attr(755,root,root) %{_bindir}/buildbot
-%{py_sitescriptdir}/buildbot*.egg-info
-%dir %{py_sitescriptdir}/buildbot
 %{py_sitescriptdir}/buildbot
+%{py_sitescriptdir}/buildbot*.egg-info
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -66,9 +65,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2009/04/14 05:54:05  glen
+- noarch, egg-info created on py2.4 too, fix duplicate files
+
 Revision 1.2  2009/01/30 18:57:19  arekm
 - rel 2; timer can be 0
 
 Revision 1.1  2008/12/03 18:12:51  arekm
 - initial
-
================================================================

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



More information about the pld-cvs-commit mailing list