speclint police: use %{l_value ...} in shtool subst and for uid/gid, too

djbdns/djbdns.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Misc
 License:      GPL
 Version:      %{V_djbdns}
-Release:      20030719
+Release:      20030721
 
 #   list of sources
 Source0:      http://cr.yp.to/djbdns/djbdns-%{V_djbdns}.tar.gz
@@ -123,9 +123,7 @@ AutoReqProv:  no
     %{l_shtool} install -c -m 755 %{l_value -s -a} \
         %{SOURCE djbdnssetup} \
         $RPM_BUILD_ROOT%{l_prefix}/sbin/
-    %{l_shtool} install -c -m 755 \
-        -e 's;@l_ruid@;%{l_ruid};g' \
-        -e 's;@l_rgid@;%{l_rgid};g' \
+    %{l_shtool} install -c -m 755 %{l_value -s -a} \
         %{SOURCE djbdnsrunsvc} \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/djbdns/bin/
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \

dss/dss.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Video
 License:      APSL
 Version:      %{V_opkg}
-Release:      20030719
+Release:      20030721
 
 #   list of sources
 Source0:      http://www.opensource.apple.com/projects/streaming/source/DSS-%{V_dss}.src.tar.gz
@@ -117,8 +117,7 @@ AutoReqProv:  no
         -e 's;^#!/.*/perl;#! %{l_prefix}/bin/perl;' \
         WebAdmin/WebAdminHtml/*.pl \
         WebAdmin/WebAdminHtml/*.cgi
-    %{l_shtool} subst \
-        -e 's;@l_prefix@;%{l_prefix};g' \
+    %{l_shtool} subst %{l_value -s -a} \
         qtaccess
 
     %{l_shtool} echo \

jitterbug/jitterbug.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Database
 License:      GPL
 Version:      1.6.2.3
-Release:      20030717
+Release:      20030721
 
 #   list of sources
 Source0:      ossp-jitterbug-%{version}.tar.gz
@@ -77,18 +77,9 @@ AutoReqProv:  no
     ( cd config
       l_hostname=`%{l_shtool} echo -e %h`
       l_domainname=`%{l_shtool} echo -e %d | cut -c2-`
-      %{l_shtool} subst -v \
+      %{l_shtool} subst -v %{l_value -s -a} \
           -e "s;@l_hostname@;$l_hostname;g" \
           -e "s;@l_domainname@;$l_domainname;g" \
-          -e 's;@l_prefix@;%{l_prefix};g' \
-          -e 's;@l_musr@;%{l_musr};g' \
-          -e 's;@l_muid@;%{l_muid};g' \
-          -e 's;@l_mgrp@;%{l_mgrp};g' \
-          -e 's;@l_mgid@;%{l_mgid};g' \
-          -e 's;@l_nusr@;%{l_nusr};g' \
-          -e 's;@l_nuid@;%{l_nuid};g' \
-          -e 's;@l_ngrp@;%{l_ngrp};g' \
-          -e 's;@l_ngid@;%{l_ngid};g' \
           `find . -type f -print`
       rm -rf */*.orig */.[a-z]*.orig >/dev/null 2>&1 || true
       %{l_shtool} mkdir -f -p -m 755 \

lyx/lyx.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Print
 License:      GPL
 Version:      %{V_lyx}
-Release:      20030710
+Release:      20030721
 
 #   package options
 %option       with_xforms no
@@ -88,8 +88,7 @@ AutoReqProv:  no
     x11_lib=`%{l_prefix}/etc/rc --query x11_libdir`
 %if "%{with_xforms}" == "yes"
     ( cd xforms-%{V_xforms}
-      %{l_shtool} subst \
-        -e 's;@l_prefix@;%{l_prefix};g' \
+      %{l_shtool} subst %{l_value -s -a} \
         Imakefile */Imakefile
       PATH=$x11_bin:$PATH
       imake -DHasGcc2 -UHasSunC -DUseInstalled -I$x11_lib/X11/config

monit/monit.spec

@@ -70,8 +70,7 @@ AutoReqProv:  no
 %prep
     %setup -q
     %patch -p0
-    %{l_shtool} subst \
-        -e 's;@l_prefix@;%{l_prefix};g' \
+    %{l_shtool} subst %{l_value -s -a} \
         files.c monit.1
     %{l_shtool} subst \
         -e 's;piddir=;dummy=;' \

mysql/mysql.spec

@@ -74,8 +74,7 @@ AutoReqProv:  no
 
 %build
     #   patch file search path
-    %{l_shtool} subst \
-        -e 's;@l_prefix@;%{l_prefix};g' \
+    %{l_shtool} subst %{l_value -s -a} \
         mysys/default.c
 
     #   determine additional configure options
@@ -115,8 +114,7 @@ AutoReqProv:  no
     rm -rf $RPM_BUILD_ROOT
 
     #   patch init script
-    %{l_shtool} subst \
-        -e 's;@l_prefix@;%{l_prefix};g' \
+    %{l_shtool} subst %{l_value -s -a} \
         scripts/mysql_install_db.sh
 
     #   perform standard installation procedure

mysql3/mysql3.spec

@@ -82,8 +82,7 @@ Provides:     mysql = %{version}-%{release}
 
 %build
     #   patch file search path
-    %{l_shtool} subst \
-        -e 's;@l_prefix@;%{l_prefix};g' \
+    %{l_shtool} subst %{l_value -s -a} \
         mysys/default.c
 
     #   patch socklen_t for Sol6
@@ -147,8 +146,7 @@ Provides:     mysql = %{version}-%{release}
     rm -rf $RPM_BUILD_ROOT
 
     #   patch init script
-    %{l_shtool} subst \
-        -e 's;@l_prefix@;%{l_prefix};g' \
+    %{l_shtool} subst %{l_value -s -a} \
         scripts/mysql_install_db.sh
 
     #   perform standard installation procedure

powerdns/powerdns.spec

@@ -140,8 +140,7 @@ Conflicts:    bind, bind8
     #   setup config file
     mv  $RPM_BUILD_ROOT%{l_prefix}/etc/powerdns/pdns.conf-dist \
         $RPM_BUILD_ROOT%{l_prefix}/etc/powerdns/pdns.conf
-    %{l_shtool} subst \
-        -e 's;@l_prefix@;%{l_prefix};g' \
+    %{l_shtool} subst %{l_value -s -a} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/powerdns/pdns.conf
 
     #   install run-command script

tripwire/tripwire.spec

@@ -104,8 +104,7 @@ AutoReqProv:  no
     %{l_shtool} subst \
         -e 's;!(IS_SOLARIS && IS_IX86);0;' \
         tripwire/smtpmailmessage.cpp
-    %{l_shtool} subst \
-        -e 's;@l_prefix@;%{l_prefix};g' \
+    %{l_shtool} subst %{l_value -s -a} \
         core/stdcore.h
     %{l_shtool} subst \
         -e 's;<malloc\.h>;<stdlib.h>;g' \

whoson/whoson.spec

@@ -72,10 +72,7 @@ AutoReqProv:  no
     %patch -p0
 
 %build
-    %{l_shtool} subst \
-        -e 's;@l_prefix@;%{l_prefix};g' \
-        -e 's;@l_rusr@;%{l_rusr};g' \
-        -e 's;@l_rgrp@;%{l_rgrp};g' \
+    %{l_shtool} subst %{l_value -s -a} \
         whoson.conf
 
     CC="%{l_cc}" \