[packages/python-genshi] always builds with speedups

glen glen at pld-linux.org
Mon May 2 22:14:23 CEST 2016


commit 499a229ae8dcfe0d69d82e71adf6711b0519b475
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon May 2 23:12:55 2016 +0300

    always builds with speedups
    
    not possible to disable them from commandline and they are enabled when
    applicable

 python-genshi.spec | 41 +++++++++++++++--------------------------
 1 file changed, 15 insertions(+), 26 deletions(-)
---
diff --git a/python-genshi.spec b/python-genshi.spec
index 890d400..c58e942 100644
--- a/python-genshi.spec
+++ b/python-genshi.spec
@@ -1,19 +1,16 @@
 # TODO:
-# - fails to build --with speedups
-# - --with speedups broken with new python macros
 # - do not enable tests before ensuring they do not lock up builders
 #
 # Conditional build:
-%bcond_with	speedups	# skip optional C extension build
 %bcond_with	tests		# build without tests (lockup builders)
 
 Summary:	Python toolkit for generation of output for the web
 Name:		python-genshi
 Version:	0.7
-Release:	0.1
+Release:	1
 License:	BSD
 Group:		Development/Languages/Python
-Source0:	http://ftp.edgewall.com/pub/genshi/Genshi-0.7.tar.gz
+Source0:	http://ftp.edgewall.com/pub/genshi/Genshi-%{version}.tar.gz
 # Source0-md5:	54e64dd69da3ec961f86e686e0848a82
 URL:		https://genshi.edgewall.org/
 BuildRequires:	python-devel
@@ -21,11 +18,8 @@ BuildRequires:	python-devel-tools
 BuildRequires:	python-setuptools
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.710
-%{!?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
@@ -41,29 +35,24 @@ textual content for output generation on the web.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%py_install \
-	%{?with_speedups:--with-speedups}
-
-%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
-%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
+%py_install
 %py_postclean
 
+%{__rm} -r $RPM_BUILD_ROOT%{py_sitedir}/genshi/filters/tests
+%{__rm} -r $RPM_BUILD_ROOT%{py_sitedir}/genshi/template/tests
+%{__rm} -r $RPM_BUILD_ROOT%{py_sitedir}/genshi/tests
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog
-%dir %{py_sitescriptdir}/genshi
-%{py_sitescriptdir}/genshi/*.py[co]
-%dir %{py_sitescriptdir}/genshi/filters
-%{py_sitescriptdir}/genshi/filters/*.py[co]
-%dir %{py_sitescriptdir}/genshi/template
-%{py_sitescriptdir}/genshi/template/*.py[co]
-
-%if %{with speedups}
-%attr(755,root,root) %{py_sitescriptdir}/genshi/_speedups.so
-%endif
-
-# egg-info is built with setuptools under py 2.4 too
-%{py_sitescriptdir}/Genshi-*.egg-info
+%dir %{py_sitedir}/genshi
+%{py_sitedir}/genshi/*.py[co]
+%dir %{py_sitedir}/genshi/filters
+%{py_sitedir}/genshi/filters/*.py[co]
+%dir %{py_sitedir}/genshi/template
+%{py_sitedir}/genshi/template/*.py[co]
+%attr(755,root,root) %{py_sitedir}/genshi/_speedups.so
+%{py_sitedir}/Genshi-*.egg-info
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-genshi.git/commitdiff/499a229ae8dcfe0d69d82e71adf6711b0519b475



More information about the pld-cvs-commit mailing list