diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index 14d7420..ad41e51 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -3,7 +3,7 @@
Name: rabbitmq-server
Version: 3.5.7
-Release: 2%{?dist}
+Release: 3%{?dist}
License: MPLv1.1
Group: Development/Libraries
Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz
@@ -52,8 +52,6 @@ scalable implementation of an AMQP broker.
# We want to install into /usr/lib, even on 64-bit platforms
%global _rabbit_libdir %{_exec_prefix}/lib/rabbitmq
%global _rabbit_erllibdir %{_rabbit_libdir}/lib/rabbitmq_server-%{version}
-%global _rabbit_wrapper %{_builddir}/%{buildsubdir}/`basename %{S:2}`
-%global _rabbit_server_ocf %{_builddir}/%{buildsubdir}/`basename %{S:4}`
%global _plugins_state_dir %{_localstatedir}/lib/rabbitmq/plugins
%global _maindir %{buildroot}%{_rabbit_erllibdir}
@@ -65,8 +63,6 @@ scalable implementation of an AMQP broker.
%build
-cp %{S:2} %{_rabbit_wrapper}
-cp %{S:4} %{_rabbit_server_ocf}
#USE_SPECS="true" USE_PROPER_QC="false" make %{?_smp_mflags}
make %{?_smp_mflags}
@@ -82,29 +78,19 @@ mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq
#Copy all necessary lib files etc.
install -p -D -m 0644 %{S:6} %{buildroot}%{_unitdir}/%{name}.service
-install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmqctl
-install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-server
-install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-plugins
-install -p -D -m 0755 %{_rabbit_server_ocf} %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server
+install -p -D -m 0755 %{S:2} %{buildroot}%{_sbindir}/rabbitmqctl
+install -p -D -m 0755 %{S:2} %{buildroot}%{_sbindir}/rabbitmq-server
+install -p -D -m 0755 %{S:2} %{buildroot}%{_sbindir}/rabbitmq-plugins
+install -p -D -m 0755 %{S:4} %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server
install -p -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server
install -p -D -m 0644 docs/rabbitmq.config.example %{buildroot}%{_sysconfdir}/rabbitmq/rabbitmq.config
-rm %{_maindir}/LICENSE %{_maindir}/LICENSE-MPL-RabbitMQ %{_maindir}/INSTALL
-
-#Build the list of files
-rm -f %{_builddir}/%{buildsubdir}/%{name}.files
-echo '%defattr(-,root,root, -)' >> %{_builddir}/%{buildsubdir}/%{name}.files
-(cd %{buildroot}; \
- find . -type f ! -regex '\.%{_sysconfdir}.*' \
- ! -regex '\.\(%{_rabbit_erllibdir}\|%{_rabbit_libdir}\).*' \
- | sed -e 's/^\.//' >> %{_builddir}/%{buildsubdir}/%{name}.files)
+rm %{_maindir}/LICENSE %{_maindir}/LICENSE-* %{_maindir}/INSTALL
install -d %{buildroot}%{_localstatedir}/run/rabbitmq
-install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf
-
-rm -rf %{buildroot}%{_rabbit_erllibdir}/LICENSE-*
+install -p -D -m 0644 %{SOURCE5} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf
%pre
@@ -150,24 +136,46 @@ done
# Run these because the SysV package being removed won't do them
/sbin/chkconfig --del %{name} >/dev/null 2>&1 || :
/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
+
+# Fix root:root ownership for config-files (recursively)
+%triggerun -- %{name} < 3.5.7-3
+chown -R rabbitmq:rabbitmq %{_sysconfdir}/rabbitmq
+
%endif
-%files -f %{name}.files
-%attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir}/lib/rabbitmq
-%attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir}/log/rabbitmq
-%dir %{_sysconfdir}/rabbitmq
-%config(noreplace) %{_sysconfdir}/rabbitmq/rabbitmq.config
+%files
+%dir %attr(0755, rabbitmq, rabbitmq) %{_sysconfdir}/rabbitmq
+%config(noreplace) %attr(0644, rabbitmq, rabbitmq) %{_sysconfdir}/rabbitmq/rabbitmq.config
+%config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server
+%{_sbindir}/rabbitmqctl
+%{_sbindir}/rabbitmq-server
+%{_sbindir}/rabbitmq-plugins
+%dir %{_rabbit_libdir}
+%dir %{_rabbit_libdir}/lib
%{_rabbit_erllibdir}
%{_rabbit_libdir}/bin
%{_unitdir}/%{name}.service
-%config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server
-%config(noreplace) %{_prefix}/lib/tmpfiles.d/%{name}.conf
-%dir %attr(755, rabbitmq, rabbitmq) %{_localstatedir}/run/rabbitmq
-%doc LICENSE LICENSE-*
+# FIXME this should add dependency on "/usr/lib/ocf/resource.d/" owner
+%dir /usr/lib/ocf/resource.d/rabbitmq/
+/usr/lib/ocf/resource.d/rabbitmq/rabbitmq-server
+%{_tmpfilesdir}/%{name}.conf
+%dir %attr(0750, rabbitmq, rabbitmq) %{_localstatedir}/lib/rabbitmq
+%dir %attr(0750, rabbitmq, rabbitmq) %{_localstatedir}/log/rabbitmq
+%dir %attr(0755, rabbitmq, rabbitmq) %{_localstatedir}/run/rabbitmq
+%doc LICENSE LICENSE-* docs/rabbitmq.config.example
+%{_mandir}/man1/rabbitmq-plugins.1*
+%{_mandir}/man1/rabbitmq-server.1*
+%{_mandir}/man1/rabbitmqctl.1*
+%{_mandir}/man5/rabbitmq-env.conf.5*
%changelog
+* Wed Dec 16 2015 Peter Lemenkov <lemenkov@gmail.com> - 3.5.7-3
+- Mark configs as owned by rabbitmq user/group
+- No need to mark tmpfiles-file as config
+- Various config cleanups
+
* Wed Dec 16 2015 Peter Lemenkov <lemenkov@gmail.com> - 3.5.7-2
- Kill support for SysV branches (no more love for EL5 and EL6). Well keep
scriptlet for upgrading from pre-2.8.4 versions for a while.