Skip to content

Commit e312ace

Browse files
author
Matthias Radestock
committed
merge bug20454 into v1_5
2 parents f8fa3ed + b7e6bd4 commit e312ace

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

packaging/RPMS/Fedora/rabbitmq-server.spec

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,12 @@ fi
3636

3737
%prep
3838
%setup -q
39-
sed -i 's|/usr/lib/|%{_libdir}/|' %{S:1}
40-
sed -i 's|/usr/lib/|%{_libdir}/|' %{S:2}
4139

4240
%build
41+
%define _source2 %{_builddir}/`basename %{S:2}`
42+
43+
cp %{S:2} %{_source2}
44+
sed -i 's|/usr/lib/|%{_libdir}/|' %{_source2}
4345
make %{?_smp_mflags}
4446

4547
%install
@@ -54,9 +56,9 @@ mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq
5456

5557
#Copy all necessary lib files etc.
5658
install -p -D -m 0755 %{S:1} %{buildroot}%{_initrddir}/rabbitmq-server
57-
install -p -D -m 0755 %{S:2} %{buildroot}%{_sbindir}/rabbitmqctl
58-
install -p -D -m 0755 %{S:2} %{buildroot}%{_sbindir}/rabbitmq-server
59-
install -p -D -m 0755 %{S:2} %{buildroot}%{_sbindir}/rabbitmq-multi
59+
install -p -D -m 0755 %{_source2} %{buildroot}%{_sbindir}/rabbitmqctl
60+
install -p -D -m 0755 %{_source2} %{buildroot}%{_sbindir}/rabbitmq-server
61+
install -p -D -m 0755 %{_source2} %{buildroot}%{_sbindir}/rabbitmq-multi
6062

6163
install -p -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server
6264

0 commit comments

Comments
 (0)