From 2f915d3c6ebcabcadbe66ff22e0ce15892037c0b930e4d8e762e0ee432072c69 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 1 Mar 2017 21:44:48 +0000
Subject: [PATCH] Accepting request 457424 from devel:languages:erlang

- Cleanup file list and prepare merging the plugins package into
  the main package:
  - No longer create parts of the filelist in %install
  - Only exclude the plugins starting with rabbitmq_* and not all
    files in the plugin dir. Some of the files are basic libraries
    needed to even launch rabbitmq. (boo#1025442)
- in the tmpfiles.d file: make the directory group owned
- own the run dir in the non systemd case

OBS-URL: https://build.opensuse.org/request/show/457424
OBS-URL: https://build.opensuse.org/package/show/network:messaging:amqp/rabbitmq-server?expand=0&rev=74
---
 rabbitmq-server.changes         | 12 ++++++++
 rabbitmq-server.spec            | 53 ++++++++++++++++-----------------
 rabbitmq-server.tmpfiles.d.conf |  2 +-
 3 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/rabbitmq-server.changes b/rabbitmq-server.changes
index 83f326e..9ddd7a3 100644
--- a/rabbitmq-server.changes
+++ b/rabbitmq-server.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Feb 15 13:09:26 UTC 2017 - mrueckert@suse.de
+
+- Cleanup file list and prepare merging the plugins package into
+  the main package:
+  - No longer create parts of the filelist in %install
+  - Only exclude the plugins starting with rabbitmq_* and not all
+    files in the plugin dir. Some of the files are basic libraries
+    needed to even launch rabbitmq. (boo#1025442)
+- in the tmpfiles.d file: make the directory group owned
+- own the run dir in the non systemd case
+
 -------------------------------------------------------------------
 Mon Feb 13 10:54:43 UTC 2017 - mrueckert@suse.de
 
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index 54b7f59..bf31d78 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%bcond_without split_plugins
 
 %define _rabbit_erllibdir %{_libdir}/rabbitmq/lib/rabbitmq_server-%{version}
 %define _rabbit_libdir %{_libdir}/rabbitmq
@@ -53,8 +54,8 @@ BuildRequires:  python-xml
 BuildRequires:  rsync
 BuildRequires:  unzip
 BuildRequires:  xmlto
-BuildRequires:  zip
 BuildRequires:  xz
+BuildRequires:  zip
 Requires:       erlang
 Requires:       erlang-epmd
 Requires:       logrotate
@@ -158,14 +159,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/rabbitmq
 mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia
 mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq
 
-# Build the list of files
-rm -f %{_builddir}/filelist.%{name}.rpm
-echo '%defattr(-,root,root, -)' >> %{_builddir}/filelist.%{name}.rpm
-(cd %{buildroot}; \
-    find . -type f ! -regex '\.%{_sysconfdir}.*' \
-        ! -regex '\.\(%{_rabbit_erllibdir}\|%{_rabbit_libdir}\).*' \
-        | sed -e 's/^\.//' >> %{_builddir}/filelist.%{name}.rpm)
-
 # Create hardlinks for duplicate files
 %fdupes %{buildroot}/usr/share
 
@@ -202,36 +195,42 @@ systemd-tmpfiles --create --clean /usr/lib/tmpfiles.d/rabbitmq-server.conf
 %insserv_cleanup
 %endif
 
-%files -f ../filelist.%{name}.rpm
+%files
 %defattr(-,root,root,-)
-%attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir}/lib/rabbitmq
-%attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir}/log/rabbitmq
-%dir %{_sysconfdir}/rabbitmq
-%dir %{_rabbit_libdir}
-#{_rabbit_libdir}/bin
-%dir %{_rabbit_libdir}/lib
-%{_rabbit_erllibdir}
+%config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server
+%config(noreplace) %{_sysconfdir}/rabbitmq/
+%{_rabbit_libdir}
+%if %{with split_plugins}
+%exclude %{_rabbit_erllibdir}/plugins/rabbitmq_*
+%endif
+#
 %if 0%{?have_systemd}
 %{_unitdir}/%{name}.service
 /usr/lib/tmpfiles.d/rabbitmq-server.conf
 %else
 %{_initddir}/rabbitmq-server
+%dir %attr(0755, rabbitmq, rabbitmq) %{_localstatedir}/run/rabbitmq
 %endif
+#
+%attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir}/lib/rabbitmq
+%attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir}/log/rabbitmq
+#
+%{_sbindir}/rabbitmq-plugins
+%{_sbindir}/rabbitmq-server
+%{_sbindir}/rabbitmqctl
 %{_sbindir}/rcrabbitmq-server
-%dir /usr/lib/ocf
-%dir /usr/lib/ocf/resource.d
-%dir /usr/lib/ocf/resource.d/rabbitmq
-%config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server
-%config(noreplace) %{_sysconfdir}/rabbitmq/rabbitmq.config
+#
+%dir /usr/lib/ocf/
+%dir /usr/lib/ocf/resource.d/
+/usr/lib/ocf/resource.d/rabbitmq/
+#
 %doc LICENSE* README* CODE_OF_CONDUCT.md CONTRIBUTING.md
-%dir %{_rabbit_erllibdir}/plugins
-%exclude %{_rabbit_erllibdir}/plugins/*
-%exclude %{_libdir}/erlang/lib/amqp_client*/*
-%exclude %{_libdir}/erlang/lib/rabbit_common*/*
 
+%if %{with split_plugins}
 %files plugins
 %defattr(-,root,root)
-%{_rabbit_erllibdir}/plugins/
+%{_rabbit_erllibdir}/plugins/rabbitmq_*
+%endif
 
 %files -n erlang-rabbitmq-client
 %defattr(-,root,root)
diff --git a/rabbitmq-server.tmpfiles.d.conf b/rabbitmq-server.tmpfiles.d.conf
index 7539e79..6fbef7f 100644
--- a/rabbitmq-server.tmpfiles.d.conf
+++ b/rabbitmq-server.tmpfiles.d.conf
@@ -1 +1 @@
-d /var/run/rabbitmq 0755 rabbitmq root - -
+d /var/run/rabbitmq 0755 rabbitmq rabbitmq - -