From 70b295ab0bf47f7fac9573957a19dc23a1e24f0b Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Sun, 13 Jul 2003 18:39:39 +0000 Subject: [PATCH] add remaining missing substitutions of variables in installation of run-command scripts --- amd/amd.spec | 3 ++- ircd/ircd.spec | 4 +++- nagios/nagios.spec | 4 +++- petidomo/petidomo.spec | 2 +- portfwd/portfwd.spec | 4 +++- rt/rt.spec | 4 +++- spegla/spegla.spec | 3 ++- tftp/rc.tftp | 2 +- tftp/tftp.spec | 6 +++--- 9 files changed, 21 insertions(+), 11 deletions(-) diff --git a/amd/amd.spec b/amd/amd.spec index 66893e59b8..957747f9ee 100644 --- a/amd/amd.spec +++ b/amd/amd.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE] Group: System License: BSD Version: 6.0.9 -Release: 20030710 +Release: 20030713 # list of sources Source0: ftp://ftp.am-utils.org/pub/am-utils/am-utils-%{version}.tar.gz @@ -120,6 +120,7 @@ AutoReqProv: no -e 's;@l_prefix@;%{l_prefix};g' \ -e 's;@l_susr@;%{l_susr};g' \ -e 's;@l_musr@;%{l_musr};g' \ + -e 's;@l_mgrp@;%{l_mgrp};g' \ %{SOURCE rc.amd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/var/amd diff --git a/ircd/ircd.spec b/ircd/ircd.spec index aa7b6e6a90..7919b6112f 100644 --- a/ircd/ircd.spec +++ b/ircd/ircd.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE] Group: Network License: BSD Version: 2.10.3p3 -Release: 20030710 +Release: 20030713 # package options %option with_fsl yes @@ -135,6 +135,8 @@ AutoReqProv: no %{l_shtool} install -c -m 755 \ -e 's;@l_prefix@;%{l_prefix};g' \ -e 's;@l_susr@;%{l_susr};g' \ + -e 's;@l_rusr@;%{l_rusr};g' \ + -e 's;@l_rgrp@;%{l_rgrp};g' \ %{SOURCE rc.ircd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ # install OSSP fsl configuration diff --git a/nagios/nagios.spec b/nagios/nagios.spec index 99783c65e2..87e1fbfefb 100644 --- a/nagios/nagios.spec +++ b/nagios/nagios.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL] Group: Network License: GNU Version: 1.1 -Release: 20030710 +Release: 20030713 # package options %option with_fsl yes @@ -177,6 +177,8 @@ AutoReqProv: no %{l_shtool} install -c -m 755 \ -e 's;@l_prefix@;%{l_prefix};g' \ -e 's;@l_susr@;%{l_susr};g' \ + -e 's;@l_rusr@;%{l_rusr};g' \ + -e 's;@l_rgrp@;%{l_rgrp};g' \ %{SOURCE rc.nagios} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ # install OSSP fsl configuration diff --git a/petidomo/petidomo.spec b/petidomo/petidomo.spec index f96c680203..59076640ba 100644 --- a/petidomo/petidomo.spec +++ b/petidomo/petidomo.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL] Group: Mail License: GPL Version: 4.0b1 -Release: 20030710 +Release: 20030713 # package options %option with_fsl yes diff --git a/portfwd/portfwd.spec b/portfwd/portfwd.spec index 62c6386bd4..009bdc71ba 100644 --- a/portfwd/portfwd.spec +++ b/portfwd/portfwd.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS] Group: Network License: GPL Version: 0.26rc6 -Release: 20030710 +Release: 20030713 # package options %option with_fsl yes @@ -122,6 +122,8 @@ AutoReqProv: no %{l_shtool} install -c -m 644 \ -e 's;@l_prefix@;%{l_prefix};g' \ -e 's;@l_susr@;%{l_susr};g' \ + -e 's;@l_rusr@;%{l_rusr};g' \ + -e 's;@l_rgrp@;%{l_rgrp};g' \ %{SOURCE rc.portfwd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ # install OSSP fsl configuration diff --git a/rt/rt.spec b/rt/rt.spec index 605a995e07..70579b548d 100644 --- a/rt/rt.spec +++ b/rt/rt.spec @@ -49,7 +49,7 @@ Distribution: OpenPKG [EVAL] Group: Database License: GPL Version: %{V_here} -Release: 20030710 +Release: 20030713 # package options %option with_color_primary 336699 @@ -321,6 +321,8 @@ AutoReqProv: no -e 's;@l_prefix@;%{l_prefix};g' \ -e 's;@l_rusr@;%{l_rusr};g' \ -e 's;@l_rgrp@;%{l_rgrp};g' \ + -e 's;@l_musr@;%{l_musr};g' \ + -e 's;@l_mgrp@;%{l_mgrp};g' \ %{SOURCE rc.rt} \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ diff --git a/spegla/spegla.spec b/spegla/spegla.spec index 606e85f224..f573fa9232 100644 --- a/spegla/spegla.spec +++ b/spegla/spegla.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL] Group: Network License: BSD Version: 1.1p4 -Release: 20030710 +Release: 20030713 # package options %option with_ipv6 no @@ -108,6 +108,7 @@ AutoReqProv: no spegla.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/ %{l_shtool} install -c -m 644 \ -e 's;@l_prefix@;%{l_prefix};g' \ + -e 's;@l_susr@;%{l_susr};g' \ %{SOURCE rc.spegla} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} diff --git a/tftp/rc.tftp b/tftp/rc.tftp index 69455b8a3b..98b7ce9294 100644 --- a/tftp/rc.tftp +++ b/tftp/rc.tftp @@ -38,7 +38,7 @@ # rotate logfile shtool rotate -f \ -n${tftp_log_numfiles} -s${tftp_log_minsize} -d \ - -z${tftp_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \ + -z${tftp_log_complevel} -o@l_nusr@ -g@l_ngrp@ -m644 \ -P "${tftp_log_prolog}" \ -E "${tftp_log_epilog}" \ @l_prefix@/var/tftp/tftp.log diff --git a/tftp/tftp.spec b/tftp/tftp.spec index d5ee6c6762..e51e086089 100644 --- a/tftp/tftp.spec +++ b/tftp/tftp.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS] Group: Networtk License: GPL Version: 0.34 -Release: 20030710 +Release: 20030713 # package options %option with_fsl yes @@ -102,8 +102,8 @@ AutoReqProv: no %{l_shtool} install -c -m 755 \ -e 's;@l_prefix@;%{l_prefix};g' \ -e 's;@l_susr@;%{l_susr};g' \ - -e 's;@l_rusr@;%{l_rusr};g' \ - -e 's;@l_rgrp@;%{l_rgrp};g' \ + -e 's;@l_nusr@;%{l_nusr};g' \ + -e 's;@l_ngrp@;%{l_ngrp};g' \ %{SOURCE rc.tftp} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ # install OSSP fsl configuration