diff --git a/fix-syntax-error-in-example-conf.patch b/fix-syntax-error-in-example-conf.patch new file mode 100644 index 0000000..b36a3e4 --- /dev/null +++ b/fix-syntax-error-in-example-conf.patch @@ -0,0 +1,11 @@ +--- docs/rabbitmq.config.example ++++ docs/rabbitmq.config.example +@@ -336,7 +336,7 @@ + %% {reconnect_delay, 2.5} + + %% ]} %% End of my_first_shovel +- ]}, ++ ]} + %% Rather than specifying some values per-shovel, you can specify + %% them for all shovels here. + %% diff --git a/rabbitmq-server-3.1.5.tar.gz b/rabbitmq-server-3.1.5.tar.gz deleted file mode 100644 index cd1c369..0000000 --- a/rabbitmq-server-3.1.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6952bdd0f0d9551fa4a068e65ad6506583a3e81babbb4e4747e0073366a6c35 -size 3562221 diff --git a/rabbitmq-server-3.2.3.tar.gz b/rabbitmq-server-3.2.3.tar.gz new file mode 100644 index 0000000..f615c80 --- /dev/null +++ b/rabbitmq-server-3.2.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb2c73338f4c477ea4ba496c4c5e18793b42f3abbd23010133b0163f85faf868 +size 3586619 diff --git a/rabbitmq-server.changes b/rabbitmq-server.changes index cfe3822..66194d6 100644 --- a/rabbitmq-server.changes +++ b/rabbitmq-server.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Jan 24 09:17:00 UTC 2014 - dmueller@suse.com + +- update to 3.2.3: + * This release fixes a number of bugs in the broker and federation plugin + * Improvements to the LDAP and shovel plugins are also included + +------------------------------------------------------------------- +Thu Jan 23 12:29:39 UTC 2014 - dmueller@suse.com + +- install a config file by default + add fix-syntax-error-in-example-conf.patch + +------------------------------------------------------------------- +Tue Jan 21 13:03:33 UTC 2014 - dmueller@suse.com + +- update to 3.2.2: + * federated queues and features enhanced policies for aspects of the broker + * This release fixes a number of bugs in the broker and plugins + ------------------------------------------------------------------- Tue Jan 7 09:43:57 UTC 2014 - matwey.kornilov@gmail.com diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index ff5e57a..3f71789 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -24,7 +24,7 @@ %endif Name: rabbitmq-server -Version: 3.1.5 +Version: 3.2.3 Release: 0 Summary: The RabbitMQ Server License: MPL-1.1 @@ -41,6 +41,7 @@ Source6: rabbitmq-server.service Source7: rabbitmq-server.tmpfiles.d.conf Patch0: no-nmap.patch Patch1: no-remove-common.patch +Patch2: fix-syntax-error-in-example-conf.patch BuildRequires: erlang BuildRequires: erlang-src BuildRequires: fdupes @@ -102,6 +103,7 @@ This package includes the RabbitMQ AMQP language bindings for Erlang. %setup -q %patch0 %patch1 +%patch2 %build make all VERSION=%{version} @@ -112,6 +114,7 @@ make install \ TARGET_DIR=%{buildroot}%{_rabbit_erllibdir} \ SBIN_DIR=%{buildroot}%{_rabbit_libdir}/bin \ MAN_DIR=%{buildroot}%{_mandir} \ + DOC_INSTALL_DIR=%{buildroot}/%{_docdir} \ VERSION=%{version} # Install init scripts @@ -136,6 +139,9 @@ 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 config files +install -p -D -m 0644 docs/rabbitmq.config.example %{buildroot}/%{_sysconfdir}/rabbitmq/rabbitmq.config + # Copy all necessary lib files etc. install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server @@ -165,7 +171,7 @@ echo '%defattr(-,root,root, -)' >> %{_builddir}/filelist.%{name}.rpm | sed -e 's/^\.//' >> %{_builddir}/filelist.%{name}.rpm) # Create hardlinks for duplicate files -%fdupes %{buildroot} +%fdupes %{buildroot}/usr/share %pre getent group rabbitmq >/dev/null || groupadd -r rabbitmq @@ -217,6 +223,7 @@ systemd-tmpfiles --create --clean /usr/lib/tmpfiles.d/rabbitmq-server.conf %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 %doc LICENSE* README %dir %{_rabbit_erllibdir}/plugins %exclude %{_rabbit_erllibdir}/plugins/*