From f46e39fce6066a60d22dc91fed47a251cd3db7a1 Mon Sep 17 00:00:00 2001 From: Hubert Plociniczak Date: Thu, 4 Sep 2008 17:30:04 +0100 Subject: Added python-json as a dependency to the debian/rpm packages --- packaging/RPMS/Fedora/rabbitmq-server.spec | 1 + packaging/debs/Debian/debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 25213816..d29b2db8 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -8,6 +8,7 @@ Group: Development/Libraries Source: http://www.rabbitmq.com/releases/%{source_name}-%{main_version}.tar.gz URL: http://www.rabbitmq.com/ Vendor: LShift Ltd., Cohesive Financial Technologies LLC., Rabbit Technlogies Ltd. +BuildRequires: python, python-json Requires: erlang Packager: Hubert Plociniczak BuildRoot: %{_tmppath}/%{name}-%{main_version}-%{release}-root diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control index df9a330b..abc6a658 100644 --- a/packaging/debs/Debian/debian/control +++ b/packaging/debs/Debian/debian/control @@ -2,7 +2,7 @@ Source: rabbitmq-server Section: net Priority: extra Maintainer: Tony Garnock-Jones -Build-Depends: cdbs, debhelper (>= 5), erlang-base | erlang-base-hipe, erlang-nox, erlang-dev, erlang-src, make, python +Build-Depends: cdbs, debhelper (>= 5), erlang-base | erlang-base-hipe, erlang-nox, erlang-dev, erlang-src, make, python, python-json Standards-Version: 3.7.2 Package: rabbitmq-server -- cgit v1.2.1 From 26586179ac092aadcf0366b82c6578118fd6d001 Mon Sep 17 00:00:00 2001 From: Hubert Plociniczak Date: Mon, 15 Sep 2008 09:55:28 +0100 Subject: Fixed checking build dependencies in rpms while building on Debian systems. Unfortunately .spec doesn't have 'not' logic. --- packaging/RPMS/Fedora/Makefile | 2 +- packaging/RPMS/Fedora/rabbitmq-server.spec | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index c8e979a7..521fac43 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -5,7 +5,7 @@ SOURCE_TARBALL_DIR=../../../dist TARBALL=$(SOURCE_TARBALL_DIR)/rabbitmq-server-$(VERSION).tar.gz TOP_DIR=$(shell pwd) RPM_VERSION=$(shell echo $(VERSION) | tr - _) -DEFINES=--define '_topdir $(TOP_DIR)' --define '_tmppath $(TOP_DIR)/tmp' --define 'main_version $(VERSION)' --define 'rpm_version $(RPM_VERSION)' +DEFINES=--define '_topdir $(TOP_DIR)' --define '_tmppath $(TOP_DIR)/tmp' --define 'main_version $(VERSION)' --define 'rpm_version $(RPM_VERSION)' --define 'debian 1' rpms: clean server diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index d29b2db8..6a57babd 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -8,7 +8,10 @@ Group: Development/Libraries Source: http://www.rabbitmq.com/releases/%{source_name}-%{main_version}.tar.gz URL: http://www.rabbitmq.com/ Vendor: LShift Ltd., Cohesive Financial Technologies LLC., Rabbit Technlogies Ltd. +%if 0%{?debian} +%else BuildRequires: python, python-json +%endif Requires: erlang Packager: Hubert Plociniczak BuildRoot: %{_tmppath}/%{name}-%{main_version}-%{release}-root -- cgit v1.2.1