From 34904761a577d72b7300c2d57e6819b5cc7f84739a283607a6e3e2f844fb2192 Mon Sep 17 00:00:00 2001 From: Jan Blunck Date: Fri, 13 Apr 2012 07:33:03 +0000 Subject: [PATCH] - Require python >= 2.6 for json - Add _initddir define for SLE11 build OBS-URL: https://build.opensuse.org/package/show/network:messaging:amqp/rabbitmq-server?expand=0&rev=5 --- rabbitmq-server.changes | 6 ++++++ rabbitmq-server.spec | 15 +++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/rabbitmq-server.changes b/rabbitmq-server.changes index 9bbcfd3..09fccc8 100644 --- a/rabbitmq-server.changes +++ b/rabbitmq-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 13 07:31:46 UTC 2012 - jblunck@opensuse.org + +- Require python >= 2.6 for json +- Add _initddir define for SLE11 build + ------------------------------------------------------------------- Tue Feb 14 09:56:04 UTC 2012 - saschpe@suse.de diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index 5306054..e70f1b9 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -15,16 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define _rabbit_erllibdir %{_libdir}/rabbitmq/lib/rabbitmq_server-%{version} %define _rabbit_libdir %{_libdir}/rabbitmq +%if %{undefined _initddir} +%define _initddir %{_sysconfdir}/init.d +%endif + Name: rabbitmq-server Version: 2.7.1 Release: 0 -License: MPL-1.1 Summary: The RabbitMQ Server -Url: http://www.rabbitmq.com/ +License: MPL-1.1 Group: System/Daemons +Url: http://www.rabbitmq.com/ Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz Source1: rabbitmq-server.init Source2: rabbitmq-script-wrapper @@ -37,8 +42,8 @@ BuildRequires: erlang BuildRequires: erlang-src BuildRequires: fdupes BuildRequires: libxslt -BuildRequires: python -BuildRequires: python-simplejson +# require python json module +BuildRequires: python >= 2.6 BuildRequires: unzip BuildRequires: xmlto BuildRequires: zip @@ -60,7 +65,6 @@ performance enterprise messaging. The RabbitMQ server is a robust and scalable implementation of an AMQP broker. %package plugins -License: MPL-1.1 Summary: Plugins for the RabbitMQ server Group: System/Daemons Requires: rabbitmq-server = %{version} @@ -73,7 +77,6 @@ scalable implementation of an AMQP broker. This package includes some plugins for the RabbitMQ server %package -n erlang-rabbitmq-client -License: MPL-1.1 Summary: RabbitMQ AMQP language bindings for Erlang Group: Development/Libraries/Other Requires: erlang