瀏覽代碼

replace double-quotes by single-quotes in substs if possible

Ralf S. Engelschall 24 年之前
父節點
當前提交
287fdaf837

+ 2 - 2
amd/amd.spec

@@ -91,11 +91,11 @@ AutoReqProv:  no
     rm -f $RPM_BUILD_ROOT%{l_prefix}/man8/automount2amd.8
     rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/amd/*
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib
-    %{l_shtool} install -c -m 644 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE amd.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/amd/
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-    %{l_shtool} install -c -m 755 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};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

+ 3 - 3
apache/apache.spec

@@ -545,11 +545,11 @@ AutoReqProv:  no
     l_hostname=`%{l_shtool} echo -e %h`
     l_domainname=`%{l_shtool} echo -e %d | cut -c2-`
     %{l_shtool} install -c -m 644 \
-        -e "s;@l_prefix@;%{l_prefix};g" \
+        -e 's;@l_prefix@;%{l_prefix};g' \
         -e "s;@l_hostname@;$l_hostname;g" \
         -e "s;@l_domainname@;$l_domainname;g" \
-        -e "s;@l_npusr@;%{l_npusr};g" \
-        -e "s;@l_npgrp@;%{l_npgrp};g" \
+        -e 's;@l_npusr@;%{l_npusr};g' \
+        -e 's;@l_npgrp@;%{l_npgrp};g' \
         %{SOURCE apache.base} \
         %{SOURCE apache.conf} \
         %{SOURCE apache.vhost} \

+ 1 - 1
bash/bash.spec

@@ -78,7 +78,7 @@ AutoReqProv:  no
     rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/bashbug
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/bash
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/bash
-    %{l_shtool} install -c -m 644 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE profile} $RPM_BUILD_ROOT%{l_prefix}/etc/bash/
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \

+ 1 - 1
findutils/findutils.spec

@@ -69,7 +69,7 @@ AutoReqProv:  no
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/var/findutils
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-    %{l_shtool} install -c -m 755 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE rc.findutils} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
     rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2> /dev/null || true

+ 1 - 1
ircd/ircd.spec

@@ -101,7 +101,7 @@ AutoReqProv:  no
     %{l_shtool} install -c -m 644 %{SOURCE ircd.conf} \
        $RPM_BUILD_ROOT%{l_prefix}/etc/ircd/ircd.conf
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-    %{l_shtool} install -c -m 755 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE rc.ircd} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
     %{l_shtool} install -c -m 644 /dev/null \

+ 1 - 1
logsurfer/logsurfer.spec

@@ -73,7 +73,7 @@ AutoReqProv:  no
         man/logsurfer.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
     %{l_shtool} install -c -m 644 \
         man/logsurfer.conf.4 $RPM_BUILD_ROOT%{l_prefix}/man/man4/
-    %{l_shtool} install -c -m 644 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE logsurfer.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/logsurfer/
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
 

+ 1 - 1
mirror/mirror.spec

@@ -92,7 +92,7 @@ AutoReqProv:  no
         %{SOURCE mirror-summary} $RPM_BUILD_ROOT%{l_prefix}/bin/
     %{l_shtool} install -c -m 644 %{SOURCE mirror.defaults} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/mirror/mirror.defaults
-    %{l_shtool} install -c -m 644 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE Makefile} \
         %{SOURCE mm.config} \
         %{SOURCE mm.pkgs} \

+ 2 - 2
mutt/mutt.spec

@@ -110,9 +110,9 @@ AutoReqProv:  no
     rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/muttbug
     rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/muttbug.1
     rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/pgp*
-    %{l_shtool} install -c -m 644 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE muttrc} $RPM_BUILD_ROOT%{l_prefix}/etc/mutt/Muttrc
-    %{l_shtool} install -c -m 644 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE mailcap} $RPM_BUILD_ROOT%{l_prefix}/etc/mutt/mailcap
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}

+ 3 - 3
mysql/mysql.spec

@@ -124,14 +124,14 @@ AutoReqProv:  no
     #   install global configuration
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/mysql
     %{l_shtool} install -c -m 644 \
-        -e "s;@l_prefix@;%{l_prefix};g" \
-        -e "s;@l_fsusr@;%{l_fsusr};g" \
+        -e 's;@l_prefix@;%{l_prefix};g' \
+        -e 's;@l_fsusr@;%{l_fsusr};g' \
         %{SOURCE my.cnf} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/mysql/
 
     #   install run-command script
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-    %{l_shtool} install -c -m 755 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE rc.mysql} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
     #   make sure the database directory exists

+ 2 - 2
ntp/ntp.spec

@@ -90,10 +90,10 @@ AutoReqProv:  no
       %{l_shtool} install -c -m 644 *.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/
     )
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/ntp
-    %{l_shtool} install -c -m 644 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE ntp.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/ntp/
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-    %{l_shtool} install -c -m 755 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
         -e 's;@l_fsusr@;%{l_fsusr};g' -e 's;@l_fsgrp@;%{l_fsgrp};g' \
         %{SOURCE rc.ntp} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/ntp/ntpd.stat

+ 1 - 1
openjade/openjade.spec

@@ -84,7 +84,7 @@ AutoReqProv:  no
     %{l_shtool} install -c -m 644 \
         dsssl/* $RPM_BUILD_ROOT%{l_prefix}/share/sgml/openjade/
     echo 'CATALOG "openjade/catalog"' >$RPM_BUILD_ROOT%{l_prefix}/share/sgml/catalog
-    %{l_shtool} install -c -m 755 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE mkcatalog} $RPM_BUILD_ROOT%{l_prefix}/bin/
     rm -f $RPM_BUILD_ROOT%{l_prefix}/share/sgml/openjade/ChangeLog
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true

+ 1 - 1
openldap/openldap.spec

@@ -82,7 +82,7 @@ AutoReqProv:  no
     rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/*/*.default
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/openldap
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-    %{l_shtool} install -c -m 755 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE rc.openldap} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \

+ 2 - 2
openpkg/openpkg.spec

@@ -532,10 +532,10 @@ Provides:     OpenPKG
       cp bash $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/bash
       strip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/bash
     )
-    sed -e "s;@l_prefix@;%{l_prefix};g" \
+    sed -e 's;@l_prefix@;%{l_prefix};g' \
         <`SOURCE rpmx.sh` >$RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpmx.sh
     chmod a+x $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpmx.sh
-    sed -e "s;@l_prefix@;%{l_prefix};g" \
+    sed -e 's;@l_prefix@;%{l_prefix};g' \
         <`SOURCE rpmx.pl` >$RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpmx.pl
     chmod a+x $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpmx.pl
   

+ 4 - 4
openssh/openssh.spec

@@ -140,7 +140,7 @@ AutoReqProv:  no
     strip $RPM_BUILD_ROOT%{l_prefix}/libexec/openssh/* 2> /dev/null || true
 
     #   install ssh-askpass wrapper
-    %{l_shtool} install -c -m 755 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE ssh-askpass} $RPM_BUILD_ROOT%{l_prefix}/libexec/openssh/
 
     #   make sure the state directory exists
@@ -148,7 +148,7 @@ AutoReqProv:  no
 
     #   install run-command script
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-    %{l_shtool} install -c -m 755 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
         -e 's;@l_fsusr@;%{l_fsusr};g' -e 's;@l_fsgrp@;%{l_fsgrp};g' \
         %{SOURCE rc.openssh} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
@@ -159,11 +159,11 @@ AutoReqProv:  no
         *-solaris* ) uselogin=no;  printmotd=yes ;; # "uselogin" does not work on Solaris!
     esac
     %{l_shtool} install -c -m 644 \
-        -e "s;@l_prefix@;%{l_prefix};g" \
+        -e 's;@l_prefix@;%{l_prefix};g' \
         -e "s;@uselogin@;$uselogin;" \
         -e "s;@printmotd@;$printmotd;" \
         %{SOURCE sshd_config} $RPM_BUILD_ROOT%{l_prefix}/etc/openssh/
-    %{l_shtool} install -c -m 644 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE ssh_config} $RPM_BUILD_ROOT%{l_prefix}/etc/openssh/
 
     #   determine installation files

+ 1 - 1
petidomo/petidomo.spec

@@ -97,7 +97,7 @@ AutoReqProv:  no
       l_hostname=`%{l_shtool} echo -e '%h%d'`
       %{l_shtool} install -c -m - \
           -e "s;@l_hostname@;${l_hostname};g" \
-          -e "s;@l_prefix@;%{l_prefix};g" \
+          -e 's;@l_prefix@;%{l_prefix};g' \
           * $RPM_BUILD_ROOT%{l_prefix}/etc/petidomo/
     )
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \

+ 4 - 4
proftpd/proftpd.spec

@@ -121,9 +121,9 @@ AutoReqProv:  no
 
     #   extended installation with own stuff
     %{l_shtool} install -c -m 644 \
-        -e "s;@l_prefix@;%{l_prefix};g" \
-        -e "s;@l_npusr@;%{l_npusr};g" \
-        -e "s;@l_npgrp@;%{l_npgrp};g" \
+        -e 's;@l_prefix@;%{l_prefix};g' \
+        -e 's;@l_npusr@;%{l_npusr};g' \
+        -e 's;@l_npgrp@;%{l_npgrp};g' \
         %{SOURCE proftpd.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/proftpd/
     %{l_shtool} install -c -m 644 \
         %{SOURCE proftpd.msg.goaway} \
@@ -136,7 +136,7 @@ AutoReqProv:  no
         %{SOURCE proftpd.msg.goaway} \
         $RPM_BUILD_ROOT%{l_prefix}/share/proftpd/.msg.goaway
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-    %{l_shtool} install -c -m 755 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE rc.proftpd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
     #   determine the package ingredients

+ 1 - 1
pureftpd/pureftpd.spec

@@ -82,7 +82,7 @@ AutoReqProv:  no
     %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-    %{l_shtool} install -c -m 755 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE rc.pureftpd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
     strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}

+ 1 - 1
samba/samba.spec

@@ -103,7 +103,7 @@ AutoReqProv:  no
     )
     l_hostname=`%{l_shtool} echo -e %h%d`
     %{l_shtool} install -c -m 644 \
-        -e "s;@l_prefix@;%{l_prefix};g" \
+        -e 's;@l_prefix@;%{l_prefix};g' \
         -e "s;@l_hostname@;$l_hostname;g" \
         %{SOURCE smb.conf} \
         %{SOURCE smb.hosts} \

+ 3 - 3
sendmail/sendmail.spec

@@ -218,9 +218,9 @@ Provides:     MTA
           *-linux*)     l_ostype=linux    ;;
       esac
       %{l_shtool} install -c -m 644 \
-          -e "s;@l_prefix@;%{l_prefix};g" \
-          -e "s;@l_fsusr@;%{l_fsusr};g" \
-          -e "s;@l_fsgrp@;%{l_fsgrp};g" \
+          -e 's;@l_prefix@;%{l_prefix};g' \
+          -e 's;@l_fsusr@;%{l_fsusr};g' \
+          -e 's;@l_fsgrp@;%{l_fsgrp};g' \
           -e "s;@l_hostname@;${l_hostname};g" \
           -e "s;@l_domainname@;${l_domainname};g" \
           -e "s;@l_ostype@;${l_ostype};g" \

+ 1 - 1
sgml/sgml.spec

@@ -61,7 +61,7 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/share/sgml
     %{l_shtool} install -c -m 644 \
         /dev/null $RPM_BUILD_ROOT%{l_prefix}/share/sgml/catalog
-    %{l_shtool} install -c -m 755 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE mkcatalog} $RPM_BUILD_ROOT%{l_prefix}/bin/
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
 

+ 1 - 1
squid/squid.spec

@@ -111,7 +111,7 @@ AutoReqProv:  no
     rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/squid/squid.conf.orig
 
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-    %{l_shtool} install -c -m 755 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE rc.squid} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \

+ 1 - 1
ssmtp/ssmtp.spec

@@ -87,7 +87,7 @@ Provides:     MTA
        $RPM_BUILD_ROOT%{l_prefix}/sbin/sendmail
     ln $RPM_BUILD_ROOT%{l_prefix}/man/man8/ssmtp.8 \
        $RPM_BUILD_ROOT%{l_prefix}/man/man8/sendmail.8
-    %{l_shtool} install -c -m 644 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE ssmtp.conf} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/ssmtp/
     %{l_shtool} install -c -m 644 revaliases \

+ 1 - 1
vim/vim.spec

@@ -389,7 +389,7 @@ AutoReqProv:  no
            $RPM_BUILD_ROOT%{l_prefix}/man/man1/$link.1
     done
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-    %{l_shtool} install -c -m 755 -e "s;@l_prefix@;%{l_prefix};g" \
+    %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE rc.vim} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}