diff options
| author | Hubert Plociniczak <hubert@lshift.net> | 2008-11-27 10:56:12 +0000 |
|---|---|---|
| committer | Hubert Plociniczak <hubert@lshift.net> | 2008-11-27 10:56:12 +0000 |
| commit | 38c37d60552b688e3df3ebe95099985b92c96168 (patch) | |
| tree | b2b3a5aa29f902c2599bfad1b16b19db18264c1e | |
| parent | cdeafaf1888fd5c0e662e849529d6ee5cdfdc9db (diff) | |
| parent | eafa2b4fa496ab5655c20608c55d5de01979ed91 (diff) | |
| download | rabbitmq-server-38c37d60552b688e3df3ebe95099985b92c96168.tar.gz | |
Merge bug19801 into default
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 3 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index 33032f11..f6d8dde8 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -20,7 +20,8 @@ prepare: cp rabbitmq-server.logrotate SOURCES/rabbitmq-server.logrotate server: prepare - rpmbuild -ba SPECS/rabbitmq-server.spec $(DEFINES) --target noarch + rpmbuild -ba SPECS/rabbitmq-server.spec $(DEFINES) --target i386 + rpmbuild -ba SPECS/rabbitmq-server.spec $(DEFINES) --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 ae2f2d2b..433eb7ca 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -15,7 +15,7 @@ BuildRequires: erlang, python-json %endif Requires: erlang, logrotate Packager: Hubert Plociniczak <hubert@lshift.net> -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%{_arch}-root Summary: The RabbitMQ server Requires(post): chkconfig Requires(pre): chkconfig initscripts @@ -25,8 +25,12 @@ 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 _erllibdir /usr/lib64/erlang/lib +%else + %define _erllibdir /usr/lib/erlang/lib +%endif -%define _erllibdir %(erl -noshell -eval "io:format('~s~n', [code:lib_dir()]), halt().") %define _maindir %{buildroot}%{_erllibdir}/rabbitmq_server-%{version} |