[python-dirq/el5: 1/2] cleaning spec file

mpaladin mpaladin at fedoraproject.org
Wed May 9 20:36:53 UTC 2012


commit 6b7d55db9bb70822a0c3f4ea606337abf45b04fc
Author: mpaladin <massimo.paladin at gmail.com>
Date:   Wed May 9 22:14:54 2012 +0200

    cleaning spec file

 python-dirq.spec |   27 +++++++++------------------
 1 files changed, 9 insertions(+), 18 deletions(-)
---
diff --git a/python-dirq.spec b/python-dirq.spec
index 9629c68..3997e7c 100644
--- a/python-dirq.spec
+++ b/python-dirq.spec
@@ -68,28 +68,18 @@ module Directory::Queue.
 %endif #end of altpython.
 
 %prep
-%setup -q -n dirq-%{version}
+%setup -q -n %{srcname}-%{version}
 chmod 644 examples/dirq_simple.py \
           examples/dirqset_simple.py
-sed -i '1s|^#!%{_bindir}/env python|#!%{_bindir}/python|' \
-           examples/dirqset_simple.py \
-           examples/dirq_simple.py \
-           test/test_dirq.py \
-           test/test_dirqset.py
 
 %if %{?altpython:1}%{!?altpython:0}
 rm -rf   %{altpydir}
-mkdir -p %{altpydir}
-cp -a *  %{altpydir}
-pushd %{altpydir}
-sed -i '1s|^#!%{_bindir}/python|#!%{_bindir}/%{altpython}|' \
-           examples/dirqset_simple.py \
-           examples/dirq_simple.py \
-           test/test_dirq.py \
-           test/test_dirqset.py
-popd
+cp -a .  %{altpydir}
+find %{altpydir} -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{_bindir}/%{altpython}|'
 %endif #end of altpython.
 
+find -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python}|'
+
 %build
 %{__python} setup.py build
 
@@ -101,18 +91,19 @@ popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
-
 %if %{?altpython:1}%{!?altpython:0}
 pushd %{altpydir}
 %{__altpython} setup.py install --skip-build --root $RPM_BUILD_ROOT
 popd
 %endif #end of altpython.
 
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+
 %check
 %{__python} setup.py test
 # And remove compiled documentation.
 rm -f test/*.pyc
+
 %if %{?altpython:1}%{!?altpython:0}
 pushd %{altpydir}
 %{__altpython} setup.py test
@@ -141,7 +132,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif #end of altpython.
 
 %changelog
-* Tue May 08 2012 Massimo Paladin <massimo.paladin at gmail.com> - 1.2.1-2
+* Wed May 09 2012 Massimo Paladin <massimo.paladin at gmail.com> - 1.2.1-2
 - Cleaning specfile and dependency error fixed on rhel5.
 
 * Mon May 07 2012 Massimo Paladin <massimo.paladin at gmail.com> - 1.2.1-1


More information about the scm-commits mailing list