monitoring/tsdb/tsdb.spec | 14 ++++++++++---- rel-eng/packages/tsdb | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-)
New commits: commit c262c7696a456a3e571c059666cbe225d2a88b16 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Oct 7 11:35:03 2009 +0200
Automatic commit of package [tsdb] release [1.27.21-1].
diff --git a/monitoring/tsdb/tsdb.spec b/monitoring/tsdb/tsdb.spec index a05f017..95b4020 100644 --- a/monitoring/tsdb/tsdb.spec +++ b/monitoring/tsdb/tsdb.spec @@ -8,7 +8,7 @@ %define npbin %{_bindir} Name: tsdb Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... -Version: 1.27.20 +Version: 1.27.21 Release: 1%{?dist} Summary: Time Series Database URL: https://fedorahosted.org/spacewalk @@ -85,6 +85,9 @@ fi rm -rf $RPM_BUILD_ROOT
%changelog +* Wed Oct 7 2009 Miroslav Suchý msuchy@redhat.com 1.27.21-1 +- Fix tsdb to install the init script properly (joshua.roys@gtri.gatech.edu) + * Mon May 11 2009 Milan Zazrivec mzazrivec@redhat.com 1.27.20-1 - 498257 - migrate existing files into new nocpulse homedir
diff --git a/rel-eng/packages/tsdb b/rel-eng/packages/tsdb index 6e40699..745ebd7 100644 --- a/rel-eng/packages/tsdb +++ b/rel-eng/packages/tsdb @@ -1 +1 @@ -1.27.20-1 monitoring/tsdb/ +1.27.21-1 monitoring/tsdb/
commit 0c93b6054f5aeb581e3eb2c1a6d93660648ef8f5 Author: Joshua Roys joshua.roys@gtri.gatech.edu Date: Mon Oct 5 09:21:30 2009 -0400
Fix tsdb to install the init script properly
Presently we end up with a directory with the init script inside it: $ rpm -ql tsdb /etc/rc.d/init.d/tsdb_local_queue /etc/rc.d/init.d/tsdb_local_queue/init_script ...
diff --git a/monitoring/tsdb/tsdb.spec b/monitoring/tsdb/tsdb.spec index c22c5c8..a05f017 100644 --- a/monitoring/tsdb/tsdb.spec +++ b/monitoring/tsdb/tsdb.spec @@ -1,4 +1,8 @@ -%define init_script %{_sysconfdir}/rc.d/init.d/tsdb_local_queue +%if 0%{!?_initddir:1} +%define _initddir %{_sysconfdir}/rc.d/init.d +%endif + +%define init_script %{_initddir}/tsdb_local_queue %define lqdir %{_var}/log/nocpulse/TSDBLocalQueue %define bdbdir %{_var}/lib/nocpulse/tsdb/bdb %define npbin %{_bindir} @@ -54,8 +58,7 @@ install -m 755 LocalQueue/drainer $RPM_BUILD_ROOT%{_bindir} install -m 755 LocalQueue/rebalance_cron $RPM_BUILD_ROOT%{_bindir}
# Local queue init script (temporary, will be superseded by sysv stuff) -install -d $RPM_BUILD_ROOT%{init_script} -install -m 755 LocalQueue/init_script $RPM_BUILD_ROOT%{init_script} +install -D -m 755 LocalQueue/init_script $RPM_BUILD_ROOT%{init_script}
%post if [ $1 -eq 2 ]; then
spacewalk-commits@lists.fedorahosted.org