From 17271b8000b75d925a71134578f0f88c7edad99199de78cc913674d673998050 Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Tue, 27 Mar 2012 08:40:08 +0000
Subject: [PATCH] - Change rabbitmq-server recommends to suggests, OpenStack
 doesn't like that - Simplified macro usage - Use upstream tarball

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-kombu?expand=0&rev=34
---
 kombu-2.1.2.tar.bz2  |  3 ---
 kombu-2.1.2.tar.gz   |  3 +++
 python-kombu.changes |  7 +++++++
 python-kombu.spec    | 16 ++++++----------
 4 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 kombu-2.1.2.tar.bz2
 create mode 100644 kombu-2.1.2.tar.gz

diff --git a/kombu-2.1.2.tar.bz2 b/kombu-2.1.2.tar.bz2
deleted file mode 100644
index ed30672..0000000
--- a/kombu-2.1.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:00ddff0c120006d9e0113e1c0241d87ea86b6c0067ac04a8dfefa0b320924d6d
-size 244273
diff --git a/kombu-2.1.2.tar.gz b/kombu-2.1.2.tar.gz
new file mode 100644
index 0000000..83254a9
--- /dev/null
+++ b/kombu-2.1.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3d14608c5ee16af8015abc0365c8ebdc47432ec1b34b8939f56dcb5d98918e74
+size 268769
diff --git a/python-kombu.changes b/python-kombu.changes
index 80f9285..b315c10 100644
--- a/python-kombu.changes
+++ b/python-kombu.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 27 08:35:53 UTC 2012 - saschpe@suse.de
+
+- Change rabbitmq-server recommends to suggests, OpenStack doesn't like that
+- Simplified macro usage
+- Use upstream tarball
+
 -------------------------------------------------------------------
 Tue Mar 20 17:42:53 UTC 2012 - alexandre@exatati.com.br
 
diff --git a/python-kombu.spec b/python-kombu.spec
index f814eb5..ba0a261 100644
--- a/python-kombu.spec
+++ b/python-kombu.spec
@@ -11,13 +11,10 @@
 # case the license is the MIT License). An "Open Source License" is a
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
-#
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%{!?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-kombu
 Version:        2.1.2
 Release:        0
@@ -25,7 +22,7 @@ License:        BSD-2-Clause
 Summary:        AMQP Messaging Framework for Python
 Url:            http://github.com/ask/kombu/
 Group:          Development/Languages/Python
-Source:         kombu-%{version}.tar.bz2
+Source:         http://pypi.python.org/packages/source/k/kombu/kombu-%{version}.tar.gz
 BuildRequires:  python-amqplib
 BuildRequires:  python-anyjson
 BuildRequires:  python-devel
@@ -35,16 +32,15 @@ BuildRequires:  python-nose-cover3
 BuildRequires:  python-unittest2
 Requires:       python-amqplib
 Requires:       python-anyjson
-Recommends:     rabbitmq-server
 Suggests:       couchdb
 Suggests:       mongodb
+Suggests:       rabbitmq-server
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version}
-%py_requires
-%if 0%{?suse_version} > 1110
+%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()")}
+%else
 BuildArch:      noarch
 %endif
-%endif
 
 %description
 An AMQP messaging framework for Python.