|
|
@@ -66,7 +66,7 @@ Class: BASE
|
|
|
Group: Web
|
|
|
License: ASF
|
|
|
Version: %{V_apache}
|
|
|
-Release: 20040813
|
|
|
+Release: 20040825
|
|
|
|
|
|
# package options (suexec related)
|
|
|
%option with_suexec yes
|
|
|
@@ -208,6 +208,7 @@ Source23: apache.vhost
|
|
|
Source24: apache.pl
|
|
|
Source25: rc.apache
|
|
|
Source26: apache.sh
|
|
|
+Source27: php.ini
|
|
|
Patch0: apache.patch
|
|
|
Patch1: apache.patch.modowa
|
|
|
Patch2: apache.patch.php
|
|
|
@@ -1208,8 +1209,8 @@ AutoReqProv: no
|
|
|
|
|
|
# optionally make PHP happy
|
|
|
%if "%{with_mod_php}" == "yes"
|
|
|
- %{l_shtool} install -c -m 644 /dev/null \
|
|
|
- $RPM_BUILD_ROOT%{l_prefix}/etc/apache/php.ini
|
|
|
+ %{l_shtool} install -c -m 644 \
|
|
|
+ %{SOURCE php.ini} $RPM_BUILD_ROOT%{l_prefix}/etc/apache/php.ini
|
|
|
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/php
|
|
|
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/php/build
|
|
|
rmdir $RPM_BUILD_ROOT%{l_prefix}/lib/php >/dev/null 2>&1 || true
|