diff options
| author | Hubert Plociniczak <hubert@lshift.net> | 2008-12-11 11:07:57 +0000 |
|---|---|---|
| committer | Hubert Plociniczak <hubert@lshift.net> | 2008-12-11 11:07:57 +0000 |
| commit | 4e44a00b8b333ec5eb6d5d464413c7e6c82b7ca5 (patch) | |
| tree | f7ecd28b938f563cd0228fc62280b37372e09cb3 | |
| parent | 5633a62130cf523acb6fad1bc19a5be60c5c2398 (diff) | |
| parent | e277a70b20345c4e722497ca70f6fe2a57f94820 (diff) | |
| download | rabbitmq-server-4e44a00b8b333ec5eb6d5d464413c7e6c82b7ca5.tar.gz | |
Merge bug19961 into default
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 3 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index 2c028e70..dfb33a6a 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -22,7 +22,8 @@ prepare: server: prepare rpmbuild -ba SPECS/rabbitmq-server.spec $(DEFINES) --target i386 - rpmbuild -ba SPECS/rabbitmq-server.spec $(DEFINES) --target x86_64 + rpmbuild -ba SPECS/rabbitmq-server.spec $(DEFINES) --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 471ae31f..3cde1dc9 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -64,9 +64,15 @@ 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 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 mkdir -p %{buildroot}/etc/logrotate.d install %SOURCE3 %{buildroot}/etc/logrotate.d/rabbitmq-server |