diff options
author | Hubert Plociniczak <hubert@lshift.net> | 2009-02-04 15:10:13 +0000 |
---|---|---|
committer | Hubert Plociniczak <hubert@lshift.net> | 2009-02-04 15:10:13 +0000 |
commit | fd31d44bf2b326514c69c9826d37e833918a13e8 (patch) | |
tree | 2896a6c92f5a174b36498a516b23607585078f6e | |
parent | 12704f7aaedcb46fe2ac294b2ae7589c48c9709a (diff) | |
download | rabbitmq-server-fd31d44bf2b326514c69c9826d37e833918a13e8.tar.gz |
Included fixes for fedora review.
Remove %debian macro and used --nodeps instead.
Renamed /etc/default/rabbitmq to /etc/sysconfig/rabbitmq as this is the default configuration file on rpm based OS.
Use make -j if possible in spec. Removed not recommended tags (vendor and packager) and added macro that prevents rpm from building useless debug rpm.
-rw-r--r-- | packaging/RPMS/Fedora/Makefile | 6 | ||||
-rw-r--r-- | packaging/RPMS/Fedora/init.d | 4 | ||||
-rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 19 |
3 files changed, 11 insertions, 18 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index 973608cc..f52dd43e 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -5,7 +5,7 @@ TARBALL=$(SOURCE_TARBALL_DIR)/rabbitmq-server-$(VERSION).tar.gz TOP_DIR=$(shell pwd) #Under debian we do not want to check build dependencies, since that #only checks build-dependencies using rpms, not debs -DEFINES=--define '_topdir $(TOP_DIR)' --define '_tmppath $(TOP_DIR)/tmp' --define 'debian 1' +DEFINES=--define '_topdir $(TOP_DIR)' --define '_tmppath $(TOP_DIR)/tmp' ifndef RPM_OS RPM_OS=fedora @@ -35,9 +35,9 @@ prepare: cp rabbitmq-server.logrotate SOURCES/rabbitmq-server.logrotate server: prepare - rpmbuild -ba SPECS/rabbitmq-server.spec $(DEFINES) $(OS_DEFINES) \ + rpmbuild -ba --nodeps SPECS/rabbitmq-server.spec $(DEFINES) $(OS_DEFINES) \ --target i386 - rpmbuild -ba SPECS/rabbitmq-server.spec $(DEFINES) $(OS_DEFINES) \ + rpmbuild -ba --nodeps SPECS/rabbitmq-server.spec $(DEFINES) $(OS_DEFINES) \ --define '_libdir /usr/lib64' --define '_arch x86_64' \ --define '_defaultdocdir /usr/share/doc' --target x86_64 diff --git a/packaging/RPMS/Fedora/init.d b/packaging/RPMS/Fedora/init.d index 3338dd99..fbb5c8ad 100644 --- a/packaging/RPMS/Fedora/init.d +++ b/packaging/RPMS/Fedora/init.d @@ -28,8 +28,8 @@ LOCK_FILE=/var/lock/subsys/$NAME test -x $DAEMON || exit 0 # Include rabbitmq defaults if available -if [ -f /etc/default/rabbitmq ] ; then - . /etc/default/rabbitmq +if [ -f /etc/sysconfig/rabbitmq ] ; then + . /etc/sysconfig/rabbitmq fi RETVAL=0 diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index bedf8d81..82531289 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -1,3 +1,5 @@ +%define debug_package %{nil} + Name: rabbitmq-server Version: %%VERSION%% Release: 1%%RELEASE_OS%% @@ -8,13 +10,8 @@ Source1: rabbitmq-server.init Source2: rabbitmq-script-wrapper Source3: rabbitmq-server.logrotate URL: http://www.rabbitmq.com/ -Vendor: LShift Ltd., Cohesive Financial Technologies LLC., Rabbit Technlogies Ltd. -%if 0%{?debian} -%else BuildRequires: erlang, python-simplejson -%endif Requires: erlang, logrotate -Packager: Hubert Plociniczak <hubert@lshift.net> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%{_arch}-root Summary: The RabbitMQ server Requires(post): %%REQUIRES%% @@ -38,11 +35,12 @@ if [ $1 -gt 1 ]; then fi %prep -%setup -n %{name}-%{version} +%setup -q +sed -i 's|/usr/lib/|%{_libdir}/|' %SOURCE1 sed -i 's|/usr/lib/|%{_libdir}/|' %SOURCE2 %build -make +make %{?_smp_mflags} %install rm -rf %{buildroot} @@ -53,14 +51,9 @@ make install TARGET_DIR=%{_maindir} \ mkdir -p %{buildroot}/var/lib/rabbitmq/mnesia mkdir -p %{buildroot}/var/log/rabbitmq -mkdir -p %{buildroot}%{_initrddir} #Copy all necessary lib files etc. -install -m 0755 %SOURCE1 %{buildroot}%{_initrddir}/rabbitmq-server -chmod 0755 %{buildroot}%{_initrddir}/rabbitmq-server -sed -i 's|/usr/lib/|%{_libdir}/|' %{buildroot}%{_initrddir}/rabbitmq-server - - +install -p -D -m 0755 %SOURCE1 %{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 |