From b7f9c53f2b441531607fd89af1b9b4ccd1105ff11623df3b312c1f4910187783 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <prusnak@opensuse.org>
Date: Tue, 14 Feb 2012 11:34:45 +0000
Subject: [PATCH] Accepting request 104934 from
 home:saschpe:branches:network:messaging:amqp

- Fixed doubled preamble entries

OBS-URL: https://build.opensuse.org/request/show/104934
OBS-URL: https://build.opensuse.org/package/show/network:messaging:amqp/rabbitmq-server?expand=0&rev=3
---
 rabbitmq-server.changes   |  5 +++++
 rabbitmq-server.rpmlintrc |  3 ---
 rabbitmq-server.spec      | 29 +++++++----------------------
 3 files changed, 12 insertions(+), 25 deletions(-)
 delete mode 100644 rabbitmq-server.rpmlintrc

diff --git a/rabbitmq-server.changes b/rabbitmq-server.changes
index a88581c..9bbcfd3 100644
--- a/rabbitmq-server.changes
+++ b/rabbitmq-server.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 14 09:56:04 UTC 2012 - saschpe@suse.de
+
+- Fixed doubled preamble entries
+
 -------------------------------------------------------------------
 Thu Feb  2 15:25:23 UTC 2012 - bwiedemann@suse.com
 
diff --git a/rabbitmq-server.rpmlintrc b/rabbitmq-server.rpmlintrc
deleted file mode 100644
index be67393..0000000
--- a/rabbitmq-server.rpmlintrc
+++ /dev/null
@@ -1,3 +0,0 @@
-addFilter("rabbitmq-server.* no-binary")
-addFilter("non-standard-uid.*/var/lib/rabbitmq")
-addFilter("non-standard-uid.*/var/log/rabbitmq")
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index 8d659bd..5306054 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -18,37 +18,22 @@
 %define _rabbit_erllibdir %{_libdir}/rabbitmq/lib/rabbitmq_server-%{version}
 %define _rabbit_libdir %{_libdir}/rabbitmq
 
-# norootforbuild
-
 Name:           rabbitmq-server
 Version:        2.7.1
-Release:        1
+Release:        0
 License:        MPL-1.1
 Summary:        The RabbitMQ Server
 Url:            http://www.rabbitmq.com/
 Group:          System/Daemons
-Provides:       AMQP-server
-Requires:       erlang, logrotate
-Requires(post): /sbin/chkconfig
-Requires(pre):  pwdutils /sbin/service
-Requires(preun): /sbin/chkconfig /sbin/service
-Requires:       %insserv_prereq %fillup_prereq
-BuildRequires:  erlang, python, zip, unzip, libxslt, xmlto
-%if 0%{?suse_version} < 1110
-BuildRequires:  python-simplejson
-%endif
-%if 0%{?suse_version} > 1020
-BuildRequires:  fdupes
-%endif
 Source:         http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz
 Source1:        rabbitmq-server.init
 Source2:        rabbitmq-script-wrapper
 Source3:        rabbitmq-server.logrotate
 Source4:        rabbitmq-asroot-script-wrapper
 Source5:        rabbitmq-server.sysconfig
-Source6:        rabbitmq-server.rpmlintrc
 Patch0:         no-nmap.patch
 Patch1:         no-remove-common.patch
+BuildRequires:  erlang
 BuildRequires:  erlang-src
 BuildRequires:  fdupes
 BuildRequires:  libxslt
@@ -57,12 +42,15 @@ BuildRequires:  python-simplejson
 BuildRequires:  unzip
 BuildRequires:  xmlto
 BuildRequires:  zip
+Requires:       %fillup_prereq
+Requires:       %insserv_prereq
 Requires:       erlang
 Requires:       logrotate
+Provides:       AMQP-server
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Requires(pre):  pwdutils
 Requires(pre):  %fillup_prereq
 Requires(pre):  %insserv_prereq
-Requires(pre):  pwdutils
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Do not use noarch since the Erlang packaging does not really allow that
 #BuildArch:      noarch
 
@@ -157,9 +145,6 @@ echo '%defattr(-,root,root, -)' >> %{_builddir}/filelist.%{name}.rpm
 # Create hardlinks for duplicate files
 %fdupes %{buildroot}
 
-%clean
-rm -rf %{buildroot}
-
 %pre
 getent group rabbitmq >/dev/null || groupadd -r rabbitmq
 getent passwd rabbitmq >/dev/null || useradd -r -g rabbitmq \