- do not use \1 instead of $1 in perl's s/// operator, it's ambigous

- use the __perl macro

Changed files:
    php.spec -> 1.252

diff --git a/php.spec b/php.spec
index 49720ae193865b2c56620a4ada0ac9c4163ce3c4..51ea40e3d9249c0050bf6d2d0bab3859696ada37 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -1471,9 +1471,9 @@ done
 %{__make}
 
 # fix install paths, avoid evil rpaths
-perl -pi -e "s|^libdir=.*|libdir='%{_libdir}'|" libphp_common.la
-perl -pi -e "s|^libdir=.*|libdir='%{_libdir}/apache'|" libphp4.la
-perl -pi -e "s|^(relink_command=.* -rpath )[^ ]*/libs |\1%{_libdir}/apache |" libphp4.la
+%{__perl} -pi -e "s|^libdir=.*|libdir='%{_libdir}'|" libphp_common.la
+%{__perl} -pi -e "s|^libdir=.*|libdir='%{_libdir}/apache'|" libphp4.la
+%{__perl} -pi -e "s|^(relink_command=.* -rpath )[^ ]*/libs |$1%{_libdir}/apache |" libphp4.la
 
 # notes:
 # -DENABLE_CHROOT_FUNC=1 (cgi,fcgi) is used in ext/standard/dir.c (libphp_common)
@@ -1522,7 +1522,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %if ! %{_apache2}
-perl -pi -e 's|^#AddType application/x-httpd-php \.php|AddType application/x-httpd-php .php|' \
+%{__perl} -pi -e 's|^#AddType application/x-httpd-php \.php|AddType application/x-httpd-php .php|' \
        /etc/httpd/httpd.conf
 %{apxs} -e -a -n php4 %{_pkglibdir}/libphp4.so 1>&2
 %endif
@@ -1541,7 +1541,7 @@ fi
 %preun
 if [ "$1" = "0" ]; then
        %{apxs} -e -A -n php4 %{_pkglibdir}/libphp4.so 1>&2
-       perl -pi -e \
+       %{__perl} -pi -e \
                's|^AddType application/x-httpd-php \.php|#AddType application/x-httpd-php .php|' \
                /etc/httpd/httpd.conf
        if [ -f /var/lock/subsys/httpd ]; then