Hello community, here is the log from the commit of package rabbitmq-server for openSUSE:Factory checked in at 2017-03-02 19:43:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rabbitmq-server (Old) and /work/SRC/openSUSE:Factory/.rabbitmq-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rabbitmq-server" Thu Mar 2 19:43:24 2017 rev:29 rq:461727 version:3.6.6 Changes: -------- --- /work/SRC/openSUSE:Factory/rabbitmq-server/rabbitmq-server.changes 2017-02-16 17:02:19.255023287 +0100 +++ /work/SRC/openSUSE:Factory/.rabbitmq-server.new/rabbitmq-server.changes 2017-03-02 19:43:25.499935818 +0100 @@ -1,0 +2,12 @@ +Wed Feb 15 13:09:26 UTC 2017 - mrueck...@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 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rabbitmq-server.spec ++++++ --- /var/tmp/diff_new_pack.mHcbzY/_old 2017-03-02 19:43:26.351815280 +0100 +++ /var/tmp/diff_new_pack.mHcbzY/_new 2017-03-02 19:43:26.355814715 +0100 @@ -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: 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}%{_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 @@ %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) ++++++ rabbitmq-server.tmpfiles.d.conf ++++++ --- /var/tmp/diff_new_pack.mHcbzY/_old 2017-03-02 19:43:26.499794342 +0100 +++ /var/tmp/diff_new_pack.mHcbzY/_new 2017-03-02 19:43:26.499794342 +0100 @@ -1 +1 @@ -d /var/run/rabbitmq 0755 rabbitmq root - - +d /var/run/rabbitmq 0755 rabbitmq rabbitmq - -
