[python-ase/el5: 6/6] failsafe backport of Python2-macros for RHEL <= 6

Björn Esser besser82 at fedoraproject.org
Sat May 3 20:13:20 UTC 2014


commit 2ee6266925a31aaa56398e92296f47d47c88f1e1
Author: Björn Esser <bjoern.esser at gmail.com>
Date:   Sat May 3 22:10:43 2014 +0200

    failsafe backport of Python2-macros for RHEL <= 6

 python-ase.spec |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 deletions(-)
---
diff --git a/python-ase.spec b/python-ase.spec
index 0a68f7a..4f48771 100644
--- a/python-ase.spec
+++ b/python-ase.spec
@@ -1,13 +1,21 @@
+# Failsafe backport of Python2-macros for RHEL <= 6
+%{!?python_sitelib:	%global python_sitelib		%(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch:	%global python_sitearch		%(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%{!?python_version:	%global python_version		%(%{__python} -c "import sys; sys.stdout.write(sys.version[:3])")}
+%{!?__python2:		%global __python2		%{__python}}
+%{!?python2_sitelib:	%global python2_sitelib		%{python_sitelib}}
+%{!?python2_sitearch:	%global python2_sitearch	%{python_sitearch}}
+%{!?python2_version:	%global python2_version		%{python_version}}
+
 %global upstream_name ase
 
 %global upstream_svn %{nil}
 %global upstream_svn .3440
 
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Name:			python-ase
 Version:		3.8.1%{?upstream_svn}
-Release:		10%{?dist}
+Release:		11%{?dist}
 Summary:		Atomic Simulation Environment
 %{?el5:Group:		Applications/Scientific}
 
@@ -52,7 +60,7 @@ analyzing simulations, visualization etc.
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -qn %{name}-%{version}
 %patch0 -p1
 %patch1 -p0
 %patch2 -p0
@@ -63,12 +71,12 @@ rm -rf doc
 
 
 %build
-%{__python} setup.py build 2>&1 | tee p2build.log
+%{__python2} setup.py build 2>&1 | tee p2build.log
 
 
 %install
 %{?el5:rm -rf $RPM_BUILD_ROOT}
-%{__python} setup.py install --skip-build --prefix=%{_prefix} \
+%{__python2} setup.py install --skip-build --prefix=%{_prefix} \
 	   --optimize=1 --root $RPM_BUILD_ROOT 2>&1 | tee p2install.log
 
 # doc would go under $RPM_BUILD_ROOT%%{_datadir}/%%{name}
@@ -93,26 +101,25 @@ done
 
 # we store translations in ase/gui/po/*/*/ag.mo
 # but /usr/lib/rpm/find-lang.sh wants locale (Fedora) or share/locale (el6)
-mkdir $RPM_BUILD_ROOT%{python_sitelib}/%{upstream_name}/gui/share
-cp -rp $RPM_BUILD_ROOT%{python_sitelib}/%{upstream_name}/gui/po $RPM_BUILD_ROOT%{python_sitelib}/%{upstream_name}/gui/share/locale
+mkdir $RPM_BUILD_ROOT%{python2_sitelib}/%{upstream_name}/gui/share
+cp -rp $RPM_BUILD_ROOT%{python2_sitelib}/%{upstream_name}/gui/po $RPM_BUILD_ROOT%{python2_sitelib}/%{upstream_name}/gui/share/locale
 %find_lang ag
-rm -rf $RPM_BUILD_ROOT%{python_sitelib}/%{upstream_name}/gui/share
+rm -rf $RPM_BUILD_ROOT%{python2_sitelib}/%{upstream_name}/gui/share
 sed -i "s|share/locale|po|g" %{PKG_TOP}/ag.lang
 
 # create list of all installed dirs/files(exclude *.mo) and concat with ag.lang
-find $RPM_BUILD_ROOT%{python_sitelib}/%{upstream_name} -type d | xargs -I _file echo "%dir _file" > %{PKG_TOP}/d.list
-find $RPM_BUILD_ROOT%{python_sitelib}/%{upstream_name} -type f ! -name "*.mo"  > %{PKG_TOP}/f.list
+find $RPM_BUILD_ROOT%{python2_sitelib}/%{upstream_name} -type d | xargs -I _file echo "%dir _file" > %{PKG_TOP}/d.list
+find $RPM_BUILD_ROOT%{python2_sitelib}/%{upstream_name} -type f ! -name "*.mo"  > %{PKG_TOP}/f.list
 cat %{PKG_TOP}/ag.lang %{PKG_TOP}/d.list %{PKG_TOP}/f.list > %{PKG_TOP}/files.list
 # trim the $RPM_BUILD_ROOT
 sed -i "s|$RPM_BUILD_ROOT||g" %{PKG_TOP}/files.list
 
 
 %check
-PYTHONVERSION=`python -c "from distutils import sysconfig; print sysconfig.get_python_version()"`
 export PYTHONPATH=`pwd`/build/lib
-export PATH=`pwd`/build/scripts-${PYTHONVERSION}:${PATH}
+export PATH=`pwd`/build/scripts-%{python2_version}:${PATH}
 mkdir p2testase && cd p2testase
-%{__python} -c "from ase.test import test; test(verbosity=2, display=False)" 2>&1 | tee ../p2testase.log
+%{__python2} -c "from ase.test import test; test(verbosity=2, display=False)" 2>&1 | tee ../p2testase.log
 cd -
 
 
@@ -123,12 +130,15 @@ cd -
 %files -f files.list
 %doc *.log COPYING* LICENSE README.txt
 %{_bindir}/*
-%{?!el5:%{python_sitelib}/*.egg-info}
+%{?!el5:%{python2_sitelib}/*.egg-info}
 %{_datadir}/applications/%{upstream_name}-gui.desktop
 %{_datadir}/pixmaps/%{upstream_name}.png
 
 
 %changelog
+* Sat May 03 2014 Björn Esser <bjoern.esser at gmail.com> - 3.8.1.3440-11
+- failsafe backport of Python2-macros for RHEL <= 6
+
 * Fri Jan 17 2014 Marcin Dulak <Marcin.Dulak at gmail.com> - 3.8.1.3440-10
 - https://bugzilla.redhat.com/show_bug.cgi?id=1044199
 - https://bugzilla.redhat.com/show_bug.cgi?id=1044200


More information about the scm-commits mailing list