Merge bug20329 into v1_5

3 files changed, 29 insertions, 38 deletions

diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile
index 973608ccba..9fe91b98d2 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' --define '_sysconfdir /etc' --define '_localstatedir /var'
 
 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 eba2db996e..d624e7c7af 100644
--- a/packaging/RPMS/Fedora/init.d
+++ b/packaging/RPMS/Fedora/init.d
@@ -27,8 +27,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
@@ -130,7 +130,7 @@ case "$1" in
         ;;
     *)
         echo "Usage: $0 {start|stop|status|rotate-logs|restart|condrestart|try-restart|reload|force-reload}" >&2
-        RETVAL=1
+        RETVAL=2
         ;;
 esac
 
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 051ff18862..328371c100 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}
-sed -i 's|/usr/lib/|%{_libdir}/|' %SOURCE2
+%setup -q
+sed -i 's|/usr/lib/|%{_libdir}/|' %{S:1}
+sed -i 's|/usr/lib/|%{_libdir}/|' %{S:2}
 
 %build
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -51,24 +49,18 @@ make install TARGET_DIR=%{_maindir} \
              SBIN_DIR=%{buildroot}%{_rabbit_libdir}/bin \
              MAN_DIR=%{buildroot}%{_mandir}
 
-mkdir -p %{buildroot}/var/lib/rabbitmq/mnesia
-mkdir -p %{buildroot}/var/log/rabbitmq
-mkdir -p %{buildroot}%{_initrddir}
+mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia
+mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq
 
 #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 %{S:1} %{buildroot}%{_initrddir}/rabbitmq-server
+install -p -D -m 0755 %{S:2} %{buildroot}%{_sbindir}/rabbitmqctl
+install -p -D -m 0755 %{S:2} %{buildroot}%{_sbindir}/rabbitmq-server
+install -p -D -m 0755 %{S:2} %{buildroot}%{_sbindir}/rabbitmq-multi
 
-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
+install -p -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server
 
-mkdir -p %{buildroot}/etc/logrotate.d
-install -m 0644 %SOURCE3 %{buildroot}/etc/logrotate.d/rabbitmq-server
-
-mkdir -p %{buildroot}/etc/rabbitmq
+mkdir -p %{buildroot}%{_sysconfdir}/rabbitmq
 
 rm %{_maindir}/LICENSE %{_maindir}/LICENSE-MPL-RabbitMQ %{_maindir}/INSTALL
 
@@ -76,7 +68,7 @@ rm %{_maindir}/LICENSE %{_maindir}/LICENSE-MPL-RabbitMQ %{_maindir}/INSTALL
 rm -f %{_builddir}/filelist.%{name}.rpm
 echo '%defattr(-,root,root, -)' >> %{_builddir}/filelist.%{name}.rpm 
 (cd %{buildroot}; \
-    find . -type f ! -regex '\./etc.*' \
+    find . -type f ! -regex '\.%{_sysconfdir}.*' \
         ! -regex '\.\(%{_rabbit_erllibdir}\|%{_rabbit_libdir}\).*' \
         | sed -e 's/^\.//' >> %{_builddir}/filelist.%{name}.rpm)
 
@@ -88,13 +80,10 @@ fi
 
 # create rabbitmq user
 if ! getent passwd rabbitmq >/dev/null; then
-        useradd -r -g rabbitmq --home /var/lib/rabbitmq  rabbitmq
-        usermod -c "RabbitMQ messaging server" rabbitmq
+        useradd -r -g rabbitmq -d %{_localstatedir}/lib/rabbitmq  rabbitmq \
+            -c "RabbitMQ messaging server" rabbitmq
 fi
 
-chown -R rabbitmq:rabbitmq /var/lib/rabbitmq
-chown -R rabbitmq:rabbitmq /var/log/rabbitmq
-
 /sbin/chkconfig --add %{name}
 
 %preun
@@ -109,13 +98,15 @@ fi
 
 %files -f ../filelist.%{name}.rpm
 %defattr(-,root,root,-)
-%dir /var/lib/rabbitmq
-%dir /var/log/rabbitmq
-%dir /etc/rabbitmq
+%attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir}/lib/rabbitmq
+%attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir}/log/rabbitmq
+%dir %{_localstatedir}/lib/rabbitmq
+%dir %{_localstatedir}/log/rabbitmq
+%dir %{_sysconfdir}/rabbitmq
 %{_rabbit_erllibdir}
 %{_rabbit_libdir}
 %{_initrddir}/rabbitmq-server
-%config(noreplace) /etc/logrotate.d/rabbitmq-server
+%config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server
 %doc LICENSE LICENSE-MPL-RabbitMQ INSTALL
 
 %clean