gwynne Wed, 15 Jul 2009 07:04:43 +0000
URL: http://svn.php.net/viewvc?view=revision&revision=284101
Changed paths:
U php/php-src/trunk/Makefile.global
U php/php-src/trunk/configure.in
U php/php-src/trunk/makerpm
D php/php-src/trunk/php5.spec.in
Log:
php5.spec was never used, as far as can be determined. also, php 5 -> php 6 in
makerpm, but that script needs considerably more work IMO
Modified: php/php-src/trunk/Makefile.global
===================================================================
--- php/php-src/trunk/Makefile.global 2009-07-15 07:01:09 UTC (rev 284100)
+++ php/php-src/trunk/Makefile.global 2009-07-15 07:04:43 UTC (rev 284101)
@@ -115,7 +115,7 @@
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
Modified: php/php-src/trunk/configure.in
===================================================================
--- php/php-src/trunk/configure.in 2009-07-15 07:01:09 UTC (rev 284100)
+++ php/php-src/trunk/configure.in 2009-07-15 07:04:43 UTC (rev 284101)
@@ -1392,7 +1392,7 @@
$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"
Modified: php/php-src/trunk/makerpm
===================================================================
--- php/php-src/trunk/makerpm 2009-07-15 07:01:09 UTC (rev 284100)
+++ php/php-src/trunk/makerpm 2009-07-15 07:04:43 UTC (rev 284101)
@@ -37,8 +37,8 @@
-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 @@
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.
Deleted: php/php-src/trunk/php5.spec.in
===================================================================
--- php/php-src/trunk/php5.spec.in 2009-07-15 07:01:09 UTC (rev 284100)
+++ php/php-src/trunk/php5.spec.in 2009-07-15 07:04:43 UTC (rev 284101)
@@ -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 <gr...@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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
