With mod_php enabled, provide the module itself only and skip the rest; PEAR is to be provided by 'php' package

apache/apache.spec

@@ -64,7 +64,7 @@ Class:        BASE
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20040416
+Release:      20040420
 
 #   package options (suexec related)
 %option       with_suexec               yes
@@ -99,6 +99,8 @@ Release:      20040416
 %option       with_mod_dosevasive       no
 
 #   package options (optional PHP4 specific settings; requires "with_mod_php")
+#   please not the lack of an PEAR option since PEAR is to be provided by
+#   the 'php' package
 %option       with_mod_php_calendar     no
 %option       with_mod_php_mysql        no
 %option       with_mod_php_pgsql        no
@@ -133,7 +135,6 @@ Release:      20040416
 %option       with_mod_php_odbc         no
 %option       with_mod_php_mbregex      no
 %option       with_mod_php_mbstring     no
-%option       with_mod_php_pear         no
 %option       with_mod_php_exif         no
 %option       with_mod_php_iconv        no
 %option       with_mod_php_sendmail     no
@@ -774,13 +775,8 @@ AutoReqProv:  no
 %if "%{with_mod_php_iconv}" == "yes"
           --with-iconv=%{l_prefix} \
 %endif
-%if "%{with_mod_php_pear}" == "yes"
-          --enable-cli \
-          --with-pear \
-%else
           --disable-cli \
           --without-pear \
-%endif
           --disable-shared \
           --enable-inline-optimization \
           --enable-track-vars
@@ -1134,7 +1130,7 @@ AutoReqProv:  no
     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
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/php-config
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/{php-config,phpextdist,phpize}
 %endif
 
     #   optionally install suPHP wrapper binary