[python-celery] update to 3.0.5

[Matthias Runge]

commit 7bc85d6d6c6ec427d72d059a935110332a89d39e
Author: Matthias Runge <mrunge at matthias-runge.de>
Date:   Fri Aug 3 11:53:16 2012 +0200

    update to 3.0.5

 .gitignore         |    1 +
 python-celery.spec |  102 ++++++++++++++++++++++++++++++++++++++++++++--------
 sources            |    2 +-
 3 files changed, 89 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dc0c9ca..bb99cef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /celery-2.2.7.tar.gz
 /celery-2.2.8.tar.gz
+/celery-3.0.5.tar.gz
diff --git a/python-celery.spec b/python-celery.spec
index 6897bbc..e6d7dae 100644
--- a/python-celery.spec
+++ b/python-celery.spec
@@ -1,24 +1,26 @@
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%if 0%{?fedora} > 12 || 0%{?rhel} > 6
+%global with_python3 0
+%else
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
 %endif
 
 Name:           python-celery
-Version:        2.2.8
-Release:        3%{?dist}
+Version:        3.0.5
+Release:        1%{?dist}
 Summary:        Distributed Task Queue
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://celeryproject.org
 Source0:        http://pypi.python.org/packages/source/c/celery/celery-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
+BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
 Requires:       python-anyjson
 Requires:       python-dateutil
-Requires:       python-kombu
+Requires:       python-kombu >= 2.2.5
+BuildRequires:  python-kombu >= 2.2.5
 Requires:       pyparsing
 %if ! (0%{?fedora} > 13 || 0%{?rhel} > 6)
 Requires:       python-importlib
@@ -28,6 +30,16 @@ Requires:       python-multiprocessing
 Requires:       python-uuid
 %endif
 
+%if 0%{?with_python3}
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-billiard
+BuildRequires:  python3-dateutil
+BuildRequires:  pytz
+BuildRequires:  python-kombu
+%endif # if with_python3
+
+
 %description
 An open source asynchronous task queue/job queue based on
 distributed message passing. It is focused on real-time
@@ -49,6 +61,36 @@ The recommended message broker is RabbitMQ, but limited support
 for Redis, Beanstalk, MongoDB, CouchDB and databases
 (using SQLAlchemy or the Django ORM) is also available.
 
+%if 0%{?with_python3}
+%package -n python3-celery
+Summary:        Distributed Task Queue
+Group:          Development/Languages
+
+Requires:       python3
+%description -n python3-celery
+An open source asynchronous task queue/job queue based on
+distributed message passing. It is focused on real-time
+operation, but supports scheduling as well.
+
+The execution units, called tasks, are executed concurrently
+on one or more worker nodes using multiprocessing, Eventlet
+or gevent. Tasks can execute asynchronously (in the background)
+or synchronously (wait until ready).
+
+Celery is used in production systems to process millions of
+tasks a day.
+
+Celery is written in Python, but the protocol can be implemented
+in any language. It can also operate with other languages using
+webhooks.
+
+The recommended message broker is RabbitMQ, but limited support
+for Redis, Beanstalk, MongoDB, CouchDB and databases
+(using SQLAlchemy or the Django ORM) is also available.
+
+%endif # with_python3
+
+
 %prep
 %setup -q -n celery-%{version}
 for script in celery/bin/camqadm.py celery/bin/celerybeat.py celery/bin/celeryd.py; do
@@ -57,29 +99,59 @@ for script in celery/bin/camqadm.py celery/bin/celerybeat.py celery/bin/celeryd.
   %{__rm} ${script}.orig
   chmod a-x ${script} 
 done
-rm -f docs/.static/.keep
+
+%if 0%{?with_python3}
+cp -a . %{py3dir}
+%endif
+
 
 %build
 %{__python} setup.py build
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif # with_python3
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install --skip-build --root %{buildroot}
+popd
+%endif # with_python3
+
+# checks are currently failing
+#%check
+#%{__python} setup.py test
+#
+#%if 0%{?with_python3}
+#pushd %{py3dir}
+#%{__python3} setup.py test
+#popd
+#%endif # with_python3
 
- 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS LICENSE README THANKS TODO docs examples
+%doc LICENSE README.rst TODO CONTRIBUTORS.txt docs examples
 %{python_sitelib}/*
 %{_bindir}/*
 
+%if 0%{?with_python3}
+%files -n python3-celery
+%doc AUTHORS LICENSE README THANKS TODO docs examples
+%{_bindir}/*
+%{python3_sitelib}/*
+%endif # with_python3
+
 
 %changelog
+* Fri Aug 03 2012 Matthias Runge <mrunge at matthias-runge.de> - 3.0.5-1
+- update to version 3.0.5
+- enable python3 support
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 492a5d6..163f77d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5aa94bea787b1fbb10c066c6b51dbafc  celery-2.2.8.tar.gz
+bf2ea38d572c7bd976810b6b4b6c1e3d  celery-3.0.5.tar.gz