php5.spec was never used, as far as can be determined. also, php 5 -> php 6 in makerp...

diff --git a/Makefile.global b/Makefile.global
index 6a62d72478e33dcd0302f1f15b8151ae17d4d390..9d5208e0f3a0f450a90fc0f010ac2383c13203e4 100644 (file)
--- a/Makefile.global
+++ b/Makefile.global
@@ -115,7 +115,7 @@ clean:
        rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
 
 distclean: clean
-       rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php5.spec sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
+       rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
        $(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f
        find . -name Makefile | xargs rm -f
 

diff --git a/configure.in b/configure.in
index 6263e28e73ae40ef29dd19603268c0bcb0024a11..747771bc50ca97929819b2ee7ee885c3d4cbe2b1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1392,7 +1392,7 @@ AC_DEFINE([HAVE_BUILD_DEFS_H], 1, [ ])
 $php_shtool mkdir -p scripts
 $php_shtool mkdir -p scripts/man1
 
-ALL_OUTPUT_FILES="php5.spec main/build-defs.h \
+ALL_OUTPUT_FILES="main/build-defs.h \
 scripts/phpize scripts/man1/phpize.1 \
 scripts/php-config scripts/man1/php-config.1 \
 $PHP_OUTPUT_FILES"

diff --git a/makerpm b/makerpm
index 1c4049b4d5f194bdd1ead38c54967fcbd93aeb0c..74a745a8823a519c062f9c0cf14431dd6dff3f84 100644 (file)
--- a/makerpm
+++ b/makerpm
@@ -37,8 +37,8 @@ sed -e "s/PVERSION/$VERSION/g" \
     -e "s/TARDIR/$TARDIR/g" \
     -e "s/PREQUIRES/$PREQUIRES/g" \
     > $SPEC <<'EOF'
-Summary: PHP 5 - A powerful scripting language
-Name: php5
+Summary: PHP 6 - A powerful scripting language
+Name: php6
 Version: PVERSION
 Release: PRELEASE
 Group: Networking/Daemons
@@ -48,7 +48,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 Requires: PREQUIRES
 
 %description
-PHP 5 is a powerful apache module that adds scripting and database connection
+PHP 6 is a powerful apache module that adds scripting and database connection
 capabilities to the apache server. This version includes the "php_cgi" binary
 for suExec and stand alone php scripts too.
 

diff --git a/php5.spec.in b/php5.spec.in
deleted file mode 100644 (file)
index 97a84b5..0000000
--- a/php5.spec.in
+++ /dev/null
@@ -1,48 +0,0 @@
-%define version @VERSION@
-%define so_version 5
-%define release 0
-
-Name: php
-Summary: PHP: Hypertext Preprocessor
-Group: Development/Languages
-Version: %{version}
-Release: %{release}
-Copyright: The PHP license (see "LICENSE" file included in distribution)
-Source: http://www.php.net/get/php-%{version}.tar.gz/from/a/mirror
-Icon: php.gif
-URL: http://www.php.net/
-Packager: PHP Group <group@php.net>
-
-BuildRoot: /var/tmp/php-%{version}
-
-%description
-PHP is an HTML-embedded scripting language. Much of its syntax is
-borrowed from C, Java and Perl with a couple of unique PHP-specific
-features thrown in. The goal of the language is to allow web
-developers to write dynamically generated pages quickly.
-
-%prep
-
-%setup
-
-%build
-set -x
-./buildconf
-./configure --prefix=/usr --with-apxs \
-       --disable-debug \
-       --with-xml=shared \
-
-# figure out configure options options based on what packages are installed
-# to override, use the OVERRIDE_OPTIONS environment variable.  To add
-# extra options, use the OPTIONS environment variable.
-
-#test rpm -q MySQL-devel >&/dev/null && OPTIONS="$OPTIONS --with-mysql=shared"
-#test rpm -q solid-devel >&/dev/null && OPTIONS="$OPTIONS --with-solid=shared,/home/solid"
-#test rpm -q postgresql-devel >&/dev/null && OPTIONS="$OPTIONS --with-pgsql=shared"
-test rpm -q expat >&/dev/null && OPTIONS="$OPTIONS --with-xml=shared"
-
-if test "x$OVERRIDE_OPTIONS" = "x"; then
-    ./configure --prefix=/usr --with-apxs=$APXS $OPTIONS
-else
-    ./configure $OVERRIDE_OPTIONS
-fi