diff options
author | Matthias Radestock <matthias@lshift.net> | 2009-03-25 20:10:23 +0000 |
---|---|---|
committer | Matthias Radestock <matthias@lshift.net> | 2009-03-25 20:10:23 +0000 |
commit | cee66a74f32036b68a5d624c5dfc7aa4ddf34826 (patch) | |
tree | e3bddcda1fa03c39d2c120b483b8f01ca03104d3 | |
parent | b0f88c37a039aaf0362e33d1dd15ef4370e933ec (diff) | |
parent | 1ebe3f2e9448aa20a568f228b5e5a5b717e3ae78 (diff) | |
download | rabbitmq-server-cee66a74f32036b68a5d624c5dfc7aa4ddf34826.tar.gz |
merge bug20460
-rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 3695c690..9a67a341 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -24,6 +24,7 @@ scalable implementation of an AMQP broker. %define _rabbit_erllibdir %{_libdir}/erlang/lib/rabbitmq_server-%{version} %define _rabbit_libdir %{_libdir}/rabbitmq +%define _rabbit_wrapper %{_builddir}/`basename %{S:2}` %define _maindir %{buildroot}%{_rabbit_erllibdir} @@ -36,10 +37,10 @@ fi %prep %setup -q -sed -i 's|/usr/lib/|%{_libdir}/|' %{S:1} -sed -i 's|/usr/lib/|%{_libdir}/|' %{S:2} %build +cp %{S:2} %{_rabbit_wrapper} +sed 's|/usr/lib/|%{_libdir}/|' %{_rabbit_wrapper} make %{?_smp_mflags} %install @@ -54,9 +55,9 @@ mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq #Copy all necessary lib files etc. install -p -D -m 0755 %{S:1} %{buildroot}%{_initrddir}/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-multi +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-multi install -p -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server @@ -100,8 +101,6 @@ fi %defattr(-,root,root,-) %attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir}/lib/rabbitmq %attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir}/log/rabbitmq -%dir %{_localstatedir}/lib/rabbitmq -%dir %{_localstatedir}/log/rabbitmq %dir %{_sysconfdir}/rabbitmq %{_rabbit_erllibdir} %{_rabbit_libdir} |