|
|
@@ -38,7 +38,7 @@ Class: BASE
|
|
|
Group: Language
|
|
|
License: PHP
|
|
|
Version: %{V_php}
|
|
|
-Release: 20040604
|
|
|
+Release: 20040611
|
|
|
|
|
|
# package options
|
|
|
%option with_bc no
|
|
|
@@ -103,6 +103,7 @@ Release: 20040604
|
|
|
# list of sources
|
|
|
Source0: http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.gz
|
|
|
Patch0: http://www.hardened-php.net/hardened-php-%{V_php}-%{V_php_hardened}.patch.gz
|
|
|
+Patch1: php.patch
|
|
|
|
|
|
# build information
|
|
|
Prefix: %{l_prefix}
|
|
|
@@ -253,8 +254,12 @@ AutoReqProv: no
|
|
|
configure \
|
|
|
ext/gd/config.m4
|
|
|
%if "%{with_hardened}" == "yes"
|
|
|
- %patch -p1
|
|
|
+ %patch -p1 -P 0
|
|
|
%endif
|
|
|
+ %patch -p1 -P 1
|
|
|
+ %{l_shtool} subst \
|
|
|
+ %{l_value -s l_prefix l_rpm l_rpmtool} \
|
|
|
+ scripts/phpize.in
|
|
|
|
|
|
%build
|
|
|
# configure package
|
|
|
@@ -478,8 +483,6 @@ AutoReqProv: no
|
|
|
$RPM_BUILD_ROOT%{l_prefix}/etc/php/php.ini
|
|
|
|
|
|
# strip down installation
|
|
|
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/php/build
|
|
|
- rmdir $RPM_BUILD_ROOT%{l_prefix}/lib/php >/dev/null 2>&1 || true
|
|
|
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
|
|
|
|
|
|
# determine installation files
|