On 10/05/2009 12:07 PM, Miroslav Suchý wrote:
a) why you put there?:
+%if 0%{!?_initddir:1}
+%define _initddir %{_sysconfdir}/rc.d/init.d
+%endif
Is some platform where _initddir is not defined?
Yep - _initrddir is defined most places - but it was improperly named.
Recent Fedora rpm macros have moved to _initddir, although they still
have _initrddir.
b) Why not instead of:
+mkdir -p $RPM_BUILD_ROOT%{_initddir}
...
-install -d $RPM_BUILD_ROOT%{init_script}
install -m 755 LocalQueue/init_script $RPM_BUILD_ROOT%{init_script}
Simplier:
-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}
That is my lack of install-fu - fixed.
c) I agree with:
-%define init_script %{_sysconfdir}/rc.d/init.d/tsdb_local_queue
+%define init_script %{_initddir}/tsdb_local_queue
Unless you have some rationale for a), I will put there b) with those
change and c) tomorrow. Of course I will be happier if you create that
new patch :)
For now I have left a) in - unless the incorrect-but-more-well-known
_initrddir should be used. Or we could just leave it as
%{_sysconfdir}/rc.d/init.d.
Thanks!
Josh
>From 8c85603ec52e00c190874da147e7129396795a26 Mon Sep 17 00:00:00 2001
From: Joshua Roys <[email protected]>
Date: Mon, 5 Oct 2009 09:21:30 -0400
Subject: [PATCH] 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
...
---
monitoring/tsdb/tsdb.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
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
--
1.6.4
_______________________________________________
Spacewalk-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/spacewalk-devel
