Author: glen Date: Tue Apr 14 06:09:44 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- ah, c'mon, don't package backup .orig from patching
---- Files affected:
SPECS:
python-TwistedCore.spec (1.19 -> 1.20)
---- Diffs:
================================================================
Index: SPECS/python-TwistedCore.spec
diff -u SPECS/python-TwistedCore.spec:1.19 SPECS/python-TwistedCore.spec:1.20
--- SPECS/python-TwistedCore.spec:1.19 Tue Apr 7 17:39:05 2009
+++ SPECS/python-TwistedCore.spec Tue Apr 14 08:09:38 2009
@@ -15,6 +15,7 @@
BuildRequires: Zope-Interface
BuildRequires: python-devel >= 1:2.5
BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.219
Requires: Zope-Interface
Requires: python-Crypto
Requires: python-devel-tools
@@ -69,26 +70,27 @@
%setup -q -n %{module}-%{version}
%patch0 -p1
+# cleanup backups after patching
+find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
%build
-CFLAGS="%{rpmcflags}"
-export CFLAGS
-python setup.py build_ext
+export CFLAGS="%{rpmcflags}"
+%{__python} setup.py build_ext
%install
rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{%{py_sitedir},%{_mandir}/man1,%{_examplesdir}/%{name}-%{version}}
-
-python setup.py install \
+%{__python} setup.py install \
--install-purelib=%{py_sitedir} \
--root=$RPM_BUILD_ROOT \
--optimize=2
-find $RPM_BUILD_ROOT%{py_sitedir} -name \*.py -exec rm {} \;
+%py_postclean
install doc/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
for dir in *; do
[ ! -d "$dir/doc/examples" ] && continue
- cp -ar "$dir/doc/examples/"
"$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/$dir"
+ cp -a "$dir/doc/examples/"
"$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/$dir"
done
%clean
@@ -107,7 +109,6 @@
%attr(755,root,root) %{_bindir}/tapconvert
%attr(755,root,root) %{_bindir}/trial
%attr(755,root,root) %{_bindir}/twistd
-%attr(755,root,root) %{_bindir}/twistd.orig
%{py_sitedir}/*.egg-info
%dir %{py_sitedir}/twisted
%{py_sitedir}/twisted/*.py[co]
@@ -160,6 +161,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.20 2009/04/14 06:09:38 glen
+- ah, c'mon, don't package backup .orig from patching
+
Revision 1.19 2009/04/07 15:39:05 uzsolt
- 8.2.0
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/python-TwistedCore.spec?r1=1.19&r2=1.20&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
