From 6b80e0346059a9aec88a35fcd88c326b8517e3b0bc4fb1519066b5ff152136a1 Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Thu, 28 Jun 2012 09:05:25 +0000
Subject: [PATCH] - Conflict with kombu >= 2.2.0 (see previous changes entry) -
 Update to 2.5.5:

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-celery?expand=0&rev=57
---
 python-celery.changes |  7 ++++++-
 python-celery.spec    | 14 +++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/python-celery.changes b/python-celery.changes
index 4fc632a..f88629d 100644
--- a/python-celery.changes
+++ b/python-celery.changes
@@ -1,7 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 28 09:04:40 UTC 2012 - saschpe@suse.de
+
+- Conflict with kombu >= 2.2.0 (see previous changes entry)
+
 -------------------------------------------------------------------
 Wed Jun  6 17:31:29 UTC 2012 - alexandre@exatati.com.br
 
-- Update to 2.5.0:
+- Update to 2.5.5:
   This is a dummy release performed for the following goals:
     - Protect against force upgrading to Kombu 2.2.0
     - Version parity with django-celery
diff --git a/python-celery.spec b/python-celery.spec
index 69b7fb8..97ea682 100644
--- a/python-celery.spec
+++ b/python-celery.spec
@@ -16,9 +16,6 @@
 #
 
 
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
 Name:           python-celery
 Version:        2.5.5
 Release:        0
@@ -36,7 +33,7 @@ BuildRequires:  python-devel
 BuildRequires:  python-distribute
 BuildRequires:  python-eventlet
 BuildRequires:  python-gevent
-BuildRequires:  python-kombu >= 2.2.0
+BuildRequires:  python-kombu >= 2.1.8
 BuildRequires:  python-mock
 BuildRequires:  python-nose-cover3
 BuildRequires:  python-pyOpenSSL
@@ -44,6 +41,9 @@ BuildRequires:  python-pyOpenSSL
 BuildRequires:  python-importlib
 BuildRequires:  python-ordereddict
 BuildRequires:  python-unittest2
+# See changes entry from "Jun  6 17:31:29 UTC 2012":
+# TODO/FIXME: Drop this as as soon as possible, d:l:p already has a newer kombu,
+Conflicts:      python-kombu >= 2.2.0
 Requires:       python-importlib
 Requires:       python-ordereddict
 %endif
@@ -57,12 +57,12 @@ Suggests:       python-gevent
 Suggests:       python-pymongo
 Suggests:       python-python-daemon
 Suggests:       python-pytyrant
-%if 0%{?suse_version}
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %py_requires
-%if 0%{?suse_version} > 1110
+%else
 BuildArch:      noarch
 %endif
-%endif
 
 %description
 Celery is an open source asynchronous task queue/job queue based on