diff --git a/rabbitmq-server-3.3.0.tar.gz b/rabbitmq-server-3.3.0.tar.gz deleted file mode 100644 index 68ca383..0000000 --- a/rabbitmq-server-3.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f0e2584becfd9826a79f44484db9bda853ffaefbdcc47cbc4065d88c2fd8623 -size 3468885 diff --git a/rabbitmq-server-3.3.1.tar.gz b/rabbitmq-server-3.3.1.tar.gz new file mode 100644 index 0000000..b91a78a --- /dev/null +++ b/rabbitmq-server-3.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33c77ba6d8a6ed632f5ea281df92b291eb3065f5446bbd4147f88dbbcd0cfa27 +size 3470277 diff --git a/rabbitmq-server.changes b/rabbitmq-server.changes index 105381b..fbe6276 100644 --- a/rabbitmq-server.changes +++ b/rabbitmq-server.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon May 5 12:49:05 UTC 2014 - dmueller@suse.com + +- update to 3.3.1: + * Bug fixes + * Security fixes to MQTT and shovel + * see http://www.rabbitmq.com/release-notes/README-3.3.1.txt + +------------------------------------------------------------------- +Wed Apr 30 00:08:33 UTC 2014 - dmueller@suse.com + +- do not install init script on systemd distros + ------------------------------------------------------------------- Thu Apr 10 10:25:08 UTC 2014 - matwey.kornilov@gmail.com diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index 91ceb9e..b28291c 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -24,7 +24,7 @@ %endif Name: rabbitmq-server -Version: 3.3.0 +Version: 3.3.1 Release: 0 Summary: The RabbitMQ Server License: MPL-1.1 @@ -119,14 +119,15 @@ make install \ DOC_INSTALL_DIR=%{buildroot}/%{_docdir} \ VERSION=%{version} +%if 0%{?have_systemd} +install -p -D -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}.service +%else # Install init scripts install -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initddir}/rabbitmq-server mkdir -p %{buildroot}%{_sbindir} ln -sf %{_initddir}/rabbitmq-server %{buildroot}%{_sbindir}/rcrabbitmq-server mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates/ install -p -D -m 644 %{SOURCE5} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.rabbitmq-server -%if 0%{?have_systemd} -install -p -D -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}.service %endif # Install wrapper scripts @@ -185,23 +186,26 @@ getent passwd rabbitmq >/dev/null || useradd -r -g rabbitmq \ exit 0 %post -%fillup_and_insserv rabbitmq-server %if 0%{?have_systemd} %service_add_post %{name}.service systemd-tmpfiles --create --clean /usr/lib/tmpfiles.d/rabbitmq-server.conf +%else +%fillup_and_insserv rabbitmq-server %endif %preun -%stop_on_removal rabbitmq-server %if 0%{?have_systemd} %service_del_preun %{name}.service +%else +%stop_on_removal rabbitmq-server %endif %postun -%restart_on_update rabbitmq-server -%insserv_cleanup %if 0%{?have_systemd} %service_del_postun %{name}.service +%else +%restart_on_update rabbitmq-server +%insserv_cleanup %endif %files -f ../filelist.%{name}.rpm @@ -213,11 +217,12 @@ systemd-tmpfiles --create --clean /usr/lib/tmpfiles.d/rabbitmq-server.conf %{_rabbit_libdir}/bin %dir %{_rabbit_libdir}/lib %{_rabbit_erllibdir} -%{_initddir}/rabbitmq-server -%{_sbindir}/rcrabbitmq-server %if 0%{?have_systemd} %{_unitdir}/%{name}.service /usr/lib/tmpfiles.d/rabbitmq-server.conf +%else +%{_sbindir}/rcrabbitmq-server +%{_initddir}/rabbitmq-server %endif %dir /usr/lib/ocf %dir /usr/lib/ocf/resource.d