com php-src: Remove php7.spec.in file: .gitignore build/Makefile.global configure.ac php7.spec.in

Commit: 5e16f5b8d8c93a124c9b41e17b923195510704c7 Author: Peter Kokot <peterkokot@gmail.com> Wed, 27 Mar 2019 23:36:59 +0100 Parents: d9fbbbc868e7dda70e3a442f4c300ba46ddf449c Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5e16f5b8d8c93a124c9b41e17b923195510704c7 Log: Remove php7.spec.in file RPM specification file was introduced via 7c2f1384d45876bbdef255c4a57301e6406f6964 for PHP to include official RPM packages long time agon. With removal of the makerpm script via 3d51d4c90c77a30a7b88aae7184dcce4b6e26b07 and Linux repositories to manage such updated and customized info in their repositories this file is most likely not needed anymore. Changed paths: M .gitignore M build/Makefile.global M configure.ac D php7.spec.in Diff: diff --git a/.gitignore b/.gitignore index 002fdca..ca7179b 100644 --- a/.gitignore +++ b/.gitignore @@ -81,9 +81,6 @@ Makefile Makefile.fragments Makefile.objects -# RPM specification file generated by ./configure -/php7.spec - # Directories for shared object files and headers generated by ./configure include/ libs/ diff --git a/build/Makefile.global b/build/Makefile..global index 14d0365..acb9edc 100644 --- a/build/Makefile.global +++ b/build/Makefile.global @@ -119,7 +119,7 @@ clean: distclean: clean rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h - rm -f php7.spec main/build-defs.h scripts/phpize + rm -f main/build-defs.h scripts/phpize rm -f ext/date/lib/timelib_config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar..phar.1 rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html diff --git a/configure.ac b/configure.ac index 67aa92b..2205c11 100644 --- a/configure.ac +++ b/configure.ac @@ -1590,7 +1590,7 @@ AC_DEFINE([HAVE_BUILD_DEFS_H], 1, [ ]) $php_shtool mkdir -p scripts $php_shtool mkdir -p scripts/man1 -ALL_OUTPUT_FILES="php7.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/php7.spec.in b/php7.spec.in deleted file mode 100644 index 97a84b5..0000000 --- a/php7.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