From 79c82217e40d579a3344308218b94a8c01317b7a Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge@redhat.com>
Date: Sep 06 2013 09:40:01 +0000
Subject: Merge branch 'f19' into f20


Conflicts:
	python-celery.spec

---

diff --git a/python-celery.spec b/python-celery.spec
index 2014835..771eb34 100644
--- a/python-celery.spec
+++ b/python-celery.spec
@@ -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,24 +155,40 @@ 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 Sep 06 2013 Matthias Runge <mrunge@redhat.com> - 3.0.15-2
+- fix requirements: python3-kombu, python3-pytz, python3-dateutil and billiard
+- separate binaries for py3 and py
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.19-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
 * Tue Apr 23 2013 Matthias Runge <mrunge@redhat.com> - 3.0.19-1
 - update to celery-3.0.19 (rhbz#919560)
 
-* Fri Feb 14 2013 Matthias Runge <mrunge@redhat.com> - 3.0.15-1
+* Fri Feb 15 2013 Matthias Runge <mrunge@redhat.com> - 3.0.15-1
 - update to celery-3.0.15 (rhbz#909919)
 
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.13-2