Author: glen Date: Sun Oct 9 19:57:02 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- python 2.4 compat
---- Files affected:
packages/iotop:
iotop.spec (1.17 -> 1.18)
---- Diffs:
================================================================
Index: packages/iotop/iotop.spec
diff -u packages/iotop/iotop.spec:1.17 packages/iotop/iotop.spec:1.18
--- packages/iotop/iotop.spec:1.17 Tue Apr 12 17:45:29 2011
+++ packages/iotop/iotop.spec Sun Oct 9 21:56:57 2011
@@ -13,7 +13,12 @@
BuildRequires: python-devel
BuildRequires: rpm-pythonprov
%pyrequires_eq python-modules
+%if "%{py_ver}" >= "2.5"
Requires: python >= 1:2.5
+%else
+Requires: python >= 1:2.4
+Requires: python-ctypes
+%endif
Requires: uname(release) >= 2.6.20
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -40,17 +45,16 @@
%setup -q
%build
-python ./setup.py build
+%{__python} setup.py build
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_mandir}/man1
-
-python ./setup.py install \
+%{__python} setup.py install \
--optimize 2 \
--root=$RPM_BUILD_ROOT
-install iotop.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p iotop.1 $RPM_BUILD_ROOT%{_mandir}/man1
%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
@@ -63,9 +67,11 @@
%defattr(644,root,root,755)
%doc NEWS THANKS
%attr(755,root,root) %{_bindir}/iotop
+%{_mandir}/man1/iotop.1*
%{py_sitescriptdir}/iotop
+%if "%{py_ver}" > "2.4"
%{py_sitescriptdir}/*.egg-info
-%{_mandir}/man1/iotop.1*
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -73,6 +79,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.18 2011/10/09 19:56:57 glen
+- python 2.4 compat
+
Revision 1.17 2011/04/12 15:45:29 marti
- up to 0.4.3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iotop/iotop.spec?r1=1.17&r2=1.18&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
