summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHubert Plociniczak <hubert@lshift.net>2009-03-25 09:58:10 +0000
committerHubert Plociniczak <hubert@lshift.net>2009-03-25 09:58:10 +0000
commit97f342542dfdd7b5000cdc44ca3b87dce948a82b (patch)
treec9fddc8fd17bd67f7f5c6e9d66d0555207b1b563
parent8d4c4b6438647c3b93310e1a0e9fbbea36f3305d (diff)
downloadrabbitmq-server-bug20454.tar.gz
More sensible name for the macro and moved the definition to preamble.bug20454
-rw-r--r--packaging/RPMS/Fedora/rabbitmq-server.spec13
1 files changed, 6 insertions, 7 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index ef5acf0f..82b78645 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}
@@ -38,10 +39,8 @@ fi
%setup -q
%build
-%define _source2 %{_builddir}/`basename %{S:2}`
-
-cp %{S:2} %{_source2}
-sed -i 's|/usr/lib/|%{_libdir}/|' %{_source2}
+cp %{S:2} %{_rabbit_wrapper}
+sed 's|/usr/lib/|%{_libdir}/|' %{_rabbit_wrapper}
make %{?_smp_mflags}
%install
@@ -56,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 %{_source2} %{buildroot}%{_sbindir}/rabbitmqctl
-install -p -D -m 0755 %{_source2} %{buildroot}%{_sbindir}/rabbitmq-server
-install -p -D -m 0755 %{_source2} %{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