diff options
| author | Hubert Plociniczak <hubert@lshift.net> | 2009-01-06 18:11:15 +0100 |
|---|---|---|
| committer | Hubert Plociniczak <hubert@lshift.net> | 2009-01-06 18:11:15 +0100 |
| commit | c4d8c273f16cc573f44ba80c239399baac71d177 (patch) | |
| tree | 362793877d6a59818381c582936d39c9169814d6 | |
| parent | 024f3ea569c94a2b967644d5d51a0f2acf99d4d5 (diff) | |
| parent | 7ce4ccd0bb45f877874376739036e3da43ad49e5 (diff) | |
| download | rabbitmq-server-git-c4d8c273f16cc573f44ba80c239399baac71d177.tar.gz | |
Merge bug20082 into v1_5_1
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 4 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 18 |
2 files changed, 6 insertions, 16 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index c05f14a7cb..aa8c93c6b0 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -20,8 +20,8 @@ prepare: server: prepare rpmbuild -ba SPECS/rabbitmq-server.spec $(DEFINES) --target i386 - rpmbuild -ba SPECS/rabbitmq-server.spec $(DEFINES) --define '_arch x86_64' \ - --define '_defaultdocdir /usr/share/doc' --target x86_64 + rpmbuild -ba SPECS/rabbitmq-server.spec $(DEFINES) --define '_libdir /usr/lib64' \ + --define '_arch x86_64' --define '_defaultdocdir /usr/share/doc' --target x86_64 clean: rm -rf SOURCES SPECS RPMS SRPMS BUILD tmp diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 13cfb0372e..62eee7dc45 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -25,14 +25,8 @@ RabbitMQ is an implementation of AMQP, the emerging standard for high performance enterprise messaging. The RabbitMQ server is a robust and scalable implementation of an AMQP broker. -%ifarch x86_64 - %define _defaultlibdir /usr/lib64 -%else - %define _defaultlibdir /usr/lib -%endif - -%define _erllibdir %{_defaultlibdir}/erlang/lib -%define _rabbitbindir %{_defaultlibdir}/rabbitmq/bin +%define _erllibdir %{_libdir}/erlang/lib +%define _rabbitbindir %{_libdir}/rabbitmq/bin %define _maindir %{buildroot}%{_erllibdir}/rabbitmq_server-%{version} @@ -63,15 +57,11 @@ mkdir -p %{buildroot}/etc/rc.d/init.d/ #Copy all necessary lib files etc. install -m 0755 %SOURCE1 %{buildroot}/etc/rc.d/init.d/rabbitmq-server chmod 0755 %{buildroot}/etc/rc.d/init.d/rabbitmq-server -%ifarch x86_64 - sed -i 's/\/usr\/lib\//\/usr\/lib64\//' %{buildroot}/etc/rc.d/init.d/rabbitmq-server -%endif +sed -i 's|/usr/lib/|%{_libdir}/|' %{buildroot}/etc/rc.d/init.d/rabbitmq-server mkdir -p %{buildroot}%{_sbindir} install -m 0755 %SOURCE2 %{buildroot}%{_sbindir}/rabbitmqctl -%ifarch x86_64 - sed -i 's/\/usr\/lib\//\/usr\/lib64\//' %{buildroot}%{_sbindir}/rabbitmqctl -%endif +sed -i 's|/usr/lib/|%{_libdir}/|' %{buildroot}%{_sbindir}/rabbitmqctl mkdir -p %{buildroot}/etc/logrotate.d install -m 0644 %SOURCE3 %{buildroot}/etc/logrotate.d/rabbitmq-server |