[packages/python-xlrd] - cleanup (no CFLAGS in noarch package); unify and simplify

glen glen at pld-linux.org
Wed Jul 18 09:26:47 CEST 2012


commit 6a3c78231142f21ec09725bbef1236b89a88303e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Jul 18 10:26:43 2012 +0300

    - cleanup (no CFLAGS in noarch package); unify and simplify

 python-xlrd.spec | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/python-xlrd.spec b/python-xlrd.spec
index 1c7f463..b061be5 100644
--- a/python-xlrd.spec
+++ b/python-xlrd.spec
@@ -1,4 +1,4 @@
-%define         module  xlrd
+%define		module	xlrd
 Summary:	Python interface to extracting data from Excel datasheets
 Summary(pl.UTF-8):	Pythonowy interfejs do odczytywania danych z arkuszy Excela
 Name:		python-%{module}
@@ -25,7 +25,6 @@ Pythonowy interfejs do odczytywania danych z arkuszy Excela
 %setup -q -n %{module}-%{version}
 
 %build
-export CFLAGS="%{rpmcflags}"
 %{__python} setup.py build
 
 %install
@@ -34,11 +33,10 @@ rm -rf $RPM_BUILD_ROOT
 	--optimize=2 \
 	--root=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-install xlrd/examples/namesdemo.xls $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-install xlrd/examples/xlrdnameAPIdemo.py $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-install scripts/runxlrd.py  $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_examplesdir}/%{name}-%{version}}
+cp -p xlrd/examples/namesdemo.xls $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -p xlrd/examples/xlrdnameAPIdemo.py $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -p scripts/runxlrd.py  $RPM_BUILD_ROOT%{_bindir}
 mv $RPM_BUILD_ROOT%{_bindir}/runxlrd.py $RPM_BUILD_ROOT%{_datadir}/%{name}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
 %py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
@@ -47,9 +45,9 @@ mv $RPM_BUILD_ROOT%{_bindir}/runxlrd.py $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/runxlrd.py \
 	$RPM_BUILD_ROOT%{py_sitescriptdir}/xlrd/{examples,doc}
 
-cat - > $RPM_BUILD_ROOT%{_bindir}/runxlrd <<EOF
+cat > $RPM_BUILD_ROOT%{_bindir}/runxlrd <<-EOF
 #!/bin/sh
-%{__python} %{_datadir}/%{name}/runxlrd.pyc "\$@"
+%{__python} %{_datadir}/%{name}/runxlrd.pyc "$@"
 EOF
 chmod a+x $RPM_BUILD_ROOT%{_bindir}/runxlrd
 


More information about the pld-cvs-commit mailing list