summaryrefslogtreecommitdiff
path: root/packaging/RPMS
diff options
context:
space:
mode:
authorMichael Bridgen <mikeb@lshift.net>2010-02-15 13:05:01 +0000
committerMichael Bridgen <mikeb@lshift.net>2010-02-15 13:05:01 +0000
commit04070fc945b9619e98007b0d574f92fe1e7a8b67 (patch)
treeeb7539cbec2d8a880e339fd9eda0cb9e3c5fa79e /packaging/RPMS
parentc73b4da7b75f2bec2a81ae26e756780355361134 (diff)
parentdc574a8ef52dd292084dedfc0692665285f3a7a7 (diff)
downloadrabbitmq-server-git-04070fc945b9619e98007b0d574f92fe1e7a8b67.tar.gz
De-bitrot by merging default in. Passes rabbit_tests:all_tests() and
the ../rabbitmq-test test suite. Some unused variables appear to have crept in during previous commits to the branch; will fix in another commit.
Diffstat (limited to 'packaging/RPMS')
-rw-r--r--packaging/RPMS/Fedora/Makefile2
-rw-r--r--packaging/RPMS/Fedora/rabbitmq-server.spec3
2 files changed, 5 insertions, 0 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile
index fa2844fddf..bc5b58cad8 100644
--- a/packaging/RPMS/Fedora/Makefile
+++ b/packaging/RPMS/Fedora/Makefile
@@ -34,6 +34,8 @@ prepare:
-e 's|^DEFAULTS_FILE=.*$$|DEFAULTS_FILE=/etc/sysconfig/rabbitmq|' \
-e 's|^LOCK_FILE=.*$$|LOCK_FILE=/var/lock/subsys/$$NAME|' \
SOURCES/rabbitmq-server.init
+ sed -i -e 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' \
+ SOURCES/rabbitmq-script-wrapper
cp rabbitmq-server.logrotate SOURCES/rabbitmq-server.logrotate
server: prepare
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 62fb1dfbc5..4dd223086f 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -118,6 +118,9 @@ fi
rm -rf %{buildroot}
%changelog
+* Fri Jan 22 2010 Matthew Sackman <matthew@lshift.net> 1.7.1-1
+- New Upstream Release
+
* Mon Oct 5 2009 David Wragg <dpw@lshift.net> 1.7.0-1
- New upstream release