[python-celery/f19] correct requirements, divide binaries (fixes rhbz#1000748)
Matthias Runge
mrunge at fedoraproject.org
Fri Sep 6 09:36:45 UTC 2013
commit e18ff7d74afc42f933a060e6231fd0abbb5d1177
Author: Matthias Runge <mrunge at redhat.com>
Date: Fri Sep 6 11:35:50 2013 +0200
correct requirements, divide binaries (fixes rhbz#1000748)
python-celery.spec | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
---
diff --git a/python-celery.spec b/python-celery.spec
index 0426334..0c3312f 100644
--- a/python-celery.spec
+++ b/python-celery.spec
@@ -6,7 +6,7 @@
Name: python-celery
Version: 3.0.15
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Distributed Task Queue
Group: Development/Languages
@@ -21,11 +21,11 @@ Requires: python-anyjson
Requires: python-dateutil
Requires: python-kombu >= 2.5.4
Requires: pyparsing
+Requires: python-billiard
%if ! (0%{?fedora} > 13 || 0%{?rhel} > 6)
Requires: python-importlib
%endif
%if ! (0%{?fedora} > 13 || 0%{?rhel} > 5)
-Requires: python-billiard >= 2.7.3.19
Requires: python-uuid
%endif
# for tests
@@ -77,6 +77,10 @@ Summary: Distributed Task Queue
Group: Development/Languages
Requires: python3
+Requires: python3-kombu
+Requires: python3-pytz
+Requires: python3-dateutil
+Requires: python3-billiard
%description -n python3-celery
An open source asynchronous task queue/job queue based on
distributed message passing. It is focused on real-time
@@ -125,12 +129,16 @@ popd
%install
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
%if 0%{?with_python3}
pushd %{py3dir}
%{__python3} setup.py install --skip-build --root %{buildroot}
+# rename py3 binary
+for i in camqadm celerybeat celeryctl celeryd celeryd-multi celeryev celery; do
+ mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/py3-$i
+done
popd
%endif # with_python3
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
# checks are currently failing
#%check
@@ -147,18 +155,34 @@ popd
%files
%doc LICENSE README.rst TODO CONTRIBUTORS.txt docs examples
%{python_sitelib}/*
-%{_bindir}/*
+%{_bindir}/camqadm
+%{_bindir}/celery
+%{_bindir}/celerybeat
+%{_bindir}/celeryctl
+%{_bindir}/celeryd
+%{_bindir}/celeryd-multi
+%{_bindir}/celeryev
%if 0%{?with_python3}
%files -n python3-celery
%doc LICENSE README.rst TODO CONTRIBUTORS.txt docs examples
-%{_bindir}/*
+%{_bindir}/py3-camqadm
+%{_bindir}/py3-celery
+%{_bindir}/py3-celerybeat
+%{_bindir}/py3-celeryctl
+%{_bindir}/py3-celeryd
+%{_bindir}/py3-celeryd-multi
+%{_bindir}/py3-celeryev
%{python3_sitelib}/*
%endif # with_python3
%changelog
-* Fri Feb 14 2013 Matthias Runge <mrunge at redhat.com> - 3.0.15-1
+* Fri Sep 06 2013 Matthias Runge <mrunge at redhat.com> - 3.0.15-2
+- fix requirements: python3-kombu, python3-pytz, python3-dateutil and billiard
+- separate binaries for py3 and py
+
+* Fri Feb 15 2013 Matthias Runge <mrunge at redhat.com> - 3.0.15-1
- update to celery-3.0.15 (rhbz#909919)
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.13-2
More information about the scm-commits
mailing list