From: radek <radek@pld-linux.org>
Date: Sun, 2 Mar 2003 23:26:22 +0000 (+0000)
Subject: - do not use \1 instead of $1 in perl's s/// operator, it's ambigous
X-Git-Tag: php-4_3_1-4~5
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=aa74012cc7809e563ab6121d72b8b5ebd8e7236f;p=packages%2Fphp.git

- 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 49720ae..51ea40e 100644
--- 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