[rabbitmq-server/el5/master: 2/3] Merged with master 2.2.0
Hubert Plociniczak
hubert at fedoraproject.org
Sat Jan 15 23:52:14 UTC 2011
commit 3055d996b364f03e84ea0b48412c8edfb153c5b6
Merge: 240740d 359031b
Author: Hubert Plociniczak <hubert.plociniczak at gmail.com>
Date: Sun Jan 16 02:41:11 2011 +0100
Merged with master 2.2.0
.gitignore | 1 +
rabbitmq-asroot-script-wrapper | 45 ----------------------------------------
rabbitmq-script-wrapper | 13 +++++++----
rabbitmq-server.spec | 14 ++++++------
sources | 2 +-
5 files changed, 17 insertions(+), 58 deletions(-)
---
diff --cc rabbitmq-server.spec
index d5e786e,90ffa82..8973000
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@@ -9,12 -9,10 +9,11 @@@ Source: http://www.rabbitmq.com/release
Source1: rabbitmq-server.init
Source2: rabbitmq-script-wrapper
Source3: rabbitmq-server.logrotate
- Source4: rabbitmq-asroot-script-wrapper
- Source5: rabbitmq-server.ocf
+ Source4: rabbitmq-server.ocf
+Patch0: xmltovalidate.patch
URL: http://www.rabbitmq.com/
BuildArch: noarch
-BuildRequires: erlang >= R12B-3, python-simplejson, xmlto, libxslt, python
+BuildRequires: erlang >= R12B-3, python-simplejson, xmlto, libxslt
Requires: erlang >= R12B-3, logrotate
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%{_arch}-root
Summary: The RabbitMQ server
@@@ -30,10 -28,10 +29,9 @@@ scalable implementation of an AMQP brok
%define _rabbit_libdir %{_exec_prefix}/lib/rabbitmq
%define _rabbit_erllibdir %{_rabbit_libdir}/lib/rabbitmq_server-%{version}
%define _rabbit_wrapper %{_builddir}/`basename %{S:2}`
- %define _rabbit_asroot_wrapper %{_builddir}/`basename %{S:4}`
- %define _rabbit_server_ocf %{_builddir}/`basename %{S:5}`
+ %define _rabbit_server_ocf %{_builddir}/`basename %{S:4}`
%define _plugins_state_dir %{_localstatedir}/lib/rabbitmq/plugins
-
%define _maindir %{buildroot}%{_rabbit_erllibdir}
%prep
More information about the scm-commits
mailing list