# - dba: enable: --with-tcadb=DIR DBA: Tokyo Cabinet abstract DB support
# --with-libmbfl=DIR MBSTRING: Use external libmbfl. DIR is the libmbfl base install directory BUNDLED
# --with-onig=DIR MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix.
-# - recheck: define PDO_MYSQL_UNIX_ADDR (ensure if's correct with mysql-libs and mysqlng)
# - uses libvpx for webp support, should use libwebp-devel instead?
+# - fpm -qn check fails, as it still loads /etc/php/php.ini
+# - co-install with php 5.3:
+# file /etc/rc.d/init.d/php-fpm from install of php54-fpm-5.4.5-0.2.i686 conflicts with file from package php-fpm-5.3.14-1.i686
+# file /usr/sbin/php-fpm from install of php54-fpm-5.4.5-0.2.i686 conflicts with file from package php-fpm-5.3.14-1.i686
+# file /usr/share/man/man8/php-fpm.8.gz from install of php54-fpm-5.4.5-0.2.i686 conflicts with file from package php-fpm-5.3.14-1.i686
+# file /usr/bin/php.cli from install of php54-cli-5.4.5-0.2.i686 conflicts with file from package php-cli-5.3.14-1.i686
+# file /usr/share/man/man1/php.1.gz from install of php54-cli-5.4.5-0.2.i686 conflicts with file from package php-cli-5.3.14-1.i686
# NOTE: mysqlnd does not support ssl or compression (see FAQ at http://dev.mysql.com/downloads/connector/php-mysqlnd/)
# UNPACKAGED EXTENSION NOTES:
# - com_dotnet is Win32-only
%undefine with_filter
%endif
-%define rel 0.5
+%define orgname php
+%define php_suffix 54
+
+%define rel 0.15
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
Summary(pt_BR.UTF-8): A linguagem de script PHP
Summary(ru.UTF-8): PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
-Name: php
-Version: 5.4.0
+Name: %{orgname}%{php_suffix}
+Version: 5.4.5
Release: %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
Epoch: 4
License: PHP
Group: Libraries
-#Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-Source0: http://downloads.php.net/stas/%{name}-%{version}RC2.tar.bz2
-# Source0-md5: 7e5ad382db17a81f0cd3c092399cb4af
-Source2: %{name}-mod_%{name}.conf
-Source3: %{name}-cgi-fcgi.ini
-Source4: %{name}-apache.ini
-Source5: %{name}-cli.ini
+Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2
+# Source0-md5: ffcc7f4dcf2b79d667fe0c110e6cb724
+Source2: %{orgname}-mod_%{orgname}.conf
+Source3: %{orgname}-cgi-fcgi.ini
+Source4: %{orgname}-apache.ini
+Source5: %{orgname}-cli.ini
# Taken from: http://browsers.garykeith.com/downloads.asp
-Source9: %{name}_browscap.ini
-Source10: %{name}-fpm.init
-Source11: %{name}-fpm.logrotate
-Source12: %{name}-branch.sh
+Source9: %{orgname}_browscap.ini
+Source10: %{orgname}-fpm.init
+Source11: %{orgname}-fpm.logrotate
+Source12: %{orgname}-branch.sh
Source13: dep-tests.sh
Source14: skip-tests.sh
# Source15Download: http://litespeedtech.com/lsapi-downloads.html
-Source15: http://litespeedtech.com/packages/lsapi/%{name}-litespeed-%{litespeed_version}.tgz
+Source15: http://litespeedtech.com/packages/lsapi/%{orgname}-litespeed-%{litespeed_version}.tgz
# Source15-md5: 9d58485d5fd6b5f5fefcec41b9ce283e
-Patch0: %{name}-shared.patch
-Patch1: %{name}-pldlogo.patch
-Patch2: %{name}-mail.patch
-Patch3: %{name}-link-libs.patch
-Patch4: %{name}-libpq_fs_h_path.patch
-Patch5: %{name}-filter-shared.patch
-Patch6: %{name}-build_modules.patch
-Patch7: %{name}-sapi-ini-file.patch
-Patch8: %{name}-config-file-scan-dir.patch
-Patch9: %{name}-sh.patch
-Patch10: %{name}-ini.patch
+Patch0: %{orgname}-shared.patch
+Patch1: %{orgname}-pldlogo.patch
+Patch2: %{orgname}-mail.patch
+Patch3: %{orgname}-link-libs.patch
+Patch4: %{orgname}-libpq_fs_h_path.patch
+Patch5: %{orgname}-filter-shared.patch
+Patch6: %{orgname}-build_modules.patch
+Patch7: %{orgname}-sapi-ini-file.patch
+Patch8: %{orgname}-config-file-scan-dir.patch
+Patch9: %{orgname}-sh.patch
+Patch10: %{orgname}-ini.patch
Patch11: embed.patch
%if %{with type_hints}
Patch12: http://ilia.ws/patch/type_hint_53_v2.txt
%endif
-Patch14: %{name}-no_pear_install.patch
-#Patch15: %{name}-zlib.patch # no longer needed?
-Patch17: %{name}-readline.patch
-Patch18: %{name}-nohttpd.patch
-Patch19: %{name}-gd_imagerotate_enable.patch
-Patch20: %{name}-uint32_t.patch
-Patch21: %{name}-dba-link.patch
-Patch22: %{name}-both-apxs.patch
-Patch23: %{name}-builddir.patch
-Patch24: %{name}-zlib-for-getimagesize.patch
-Patch25: %{name}-stupidapache_version.patch
-Patch26: %{name}-pear.patch
-Patch27: %{name}-config-dir.patch
-Patch29: %{name}-fcgi-graceful.patch
-Patch31: %{name}-fcgi-error_log-no-newlines.patch
-#Patch32: %{name}-curl-limit-speed.patch # applied upstream
-Patch34: %{name}-libtool.patch
-Patch35: %{name}-tds.patch
-Patch36: %{name}-mysql-charsetphpini.patch
-Patch37: %{name}-mysqli-charsetphpini.patch
-Patch38: %{name}-pdo_mysql-charsetphpini.patch
-Patch39: %{name}-use-prog_sendmail.patch
-Patch41: %{name}-fpm-config.patch
-Patch42: %{name}-fpm-shared.patch
-Patch43: %{name}-silent-session-cleanup.patch
-Patch44: %{name}-include_path.patch
-Patch45: %{name}-imap-annotations.patch
-Patch46: %{name}-imap-myrights.patch
+Patch14: %{orgname}-no_pear_install.patch
+#Patch15: %{orgname}-zlib.patch # no longer needed?
+Patch17: %{orgname}-readline.patch
+Patch18: %{orgname}-nohttpd.patch
+Patch19: %{orgname}-gd_imagerotate_enable.patch
+Patch20: %{orgname}-uint32_t.patch
+Patch21: %{orgname}-dba-link.patch
+Patch22: %{orgname}-both-apxs.patch
+Patch23: %{orgname}-builddir.patch
+Patch24: %{orgname}-zlib-for-getimagesize.patch
+Patch25: %{orgname}-stupidapache_version.patch
+Patch26: %{orgname}-pear.patch
+Patch27: %{orgname}-config-dir.patch
+Patch29: %{orgname}-fcgi-graceful.patch
+Patch31: %{orgname}-fcgi-error_log-no-newlines.patch
+#Patch32: %{orgname}-curl-limit-speed.patch # applied upstream
+Patch34: %{orgname}-libtool.patch
+Patch35: %{orgname}-tds.patch
+Patch36: %{orgname}-mysql-charsetphpini.patch
+Patch37: %{orgname}-mysqli-charsetphpini.patch
+Patch38: %{orgname}-pdo_mysql-charsetphpini.patch
+Patch39: %{orgname}-use-prog_sendmail.patch
+Patch41: %{orgname}-fpm-config.patch
+Patch42: %{orgname}-fpm-shared.patch
+Patch43: %{orgname}-silent-session-cleanup.patch
+Patch44: %{orgname}-include_path.patch
+Patch45: %{orgname}-imap-annotations.patch
+Patch46: %{orgname}-imap-myrights.patch
Patch47: suhosin.patch
-#Patch49: %{name}-m4-divert.patch # no longer needed, upstream supports new ac
+#Patch49: %{orgname}-m4-divert.patch # no longer needed, upstream supports new ac
Patch50: extension-shared-optional-dep.patch
Patch51: spl-shared.patch
Patch52: pcre-shared.patch
#Patch54: mysqlnd-shared.patch # shared build supported upstream
Patch55: bug-52078-fileinode.patch
#Patch57: bug-52448.patch # outdated
-Patch59: %{name}-systzdata.patch
-Patch60: %{name}-oracle-instantclient.patch
-#Patch61: %{name}-krb5-ac.patch # not needed on 5.4 anymore
+Patch59: %{orgname}-systzdata.patch
+Patch60: %{orgname}-oracle-instantclient.patch
+#Patch61: %{orgname}-krb5-ac.patch # not needed on 5.4 anymore
Patch62: mcrypt-libs.patch
-Patch63: %{name}-mysql-nowarning.patch
-#Patch64: %{name}-m4.patch # not needed on 5.4 branch
+Patch63: %{orgname}-mysql-nowarning.patch
+#Patch64: %{orgname}-m4.patch # not needed on 5.4 branch
# http://spot.fedorapeople.org/php-5.3.6-libzip.patch
Patch65: system-libzip.patch
URL: http://www.php.net/
#BuildRequires: flex
%{?with_kerberos5:BuildRequires: heimdal-devel}
%{?with_system_libzip:BuildRequires: libzip-devel >= 0.10-3}
-BuildRequires: mysql-devel
+%{!?with_mysqlnd:BuildRequires: mysql-devel}
BuildRequires: pkgconfig
BuildRequires: sed >= 4.0
%if %{with mssql} || %{with sybase_ct}
%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define php_sysconfdir /etc/php
-%define php_extensiondir %{_libdir}/php
+%define php_sysconfdir /etc/%{name}
+%define php_extensiondir %{_libdir}/%{name}
%define _sysconfdir %{php_sysconfdir}
# must be in sync with source. extra check ensuring that it is so is done in %%build
# Extension versions
%define bz2ver 1.0
%define enchantver 1.1.0
-%define fileinfover 1.0.5-dev
+%define fileinfover 1.0.5
%define hashver 1.0
%define intlver 1.1.0
%define jsonver 1.2.1
%define pharver 2.0.1
-%define zipver 1.9.1
+%define sqlite3ver 0.7
+%define zipver 1.11.0
%define zend_zts %{!?with_zts:0}%{?with_zts:1}
%define php_debug %{!?debug:0}%{?debug:1}
роботи з базами даних є доволі простим. Найбільш популярне
використання PHP - заміна для CGI скриптів.
-%package -n apache1-mod_php
+%package -n apache1-mod_%{name}
Summary: PHP DSO module for Apache 1.3.x
Summary(pl.UTF-8): Moduł DSO (Dynamic Shared Object) PHP dla Apache 1.3.x
Group: Development/Languages/PHP
Obsoletes: apache-mod_php < 1:4.1.1
Obsoletes: phpfi
-%description -n apache1-mod_php
+%description -n apache1-mod_%{name}
PHP as DSO module for Apache 1.3.x.
-%description -n apache1-mod_php -l pl.UTF-8
+%description -n apache1-mod_%{name} -l pl.UTF-8
PHP jako moduł DSO (Dynamic Shared Object) dla Apache 1.3.x.
-%package -n apache-mod_php
+%package -n apache-mod_%{name}
Summary: PHP DSO module for Apache 2.x
Summary(pl.UTF-8): Moduł DSO (Dynamic Shared Object) PHP dla Apache 2.x
Group: Development/Languages/PHP
Provides: webserver(php) = %{version}
Obsoletes: phpfi
-%description -n apache-mod_php
+%description -n apache-mod_%{name}
PHP as DSO module for Apache 2.x.
-%description -n apache-mod_php -l pl.UTF-8
+%description -n apache-mod_%{name} -l pl.UTF-8
PHP jako moduł DSO (Dynamic Shared Object) dla Apache 2.x.
%package litespeed
%package embedded
Summary: PHP library for embedding in applications
+Summary(pl.UTF-8): Biblioteka PHP do osadzania w aplikacjach
Group: Libraries
Requires: %{name}-common = %{epoch}:%{version}-%{release}
The php-embedded package contains a library which can be embedded into
applications to provide PHP scripting language support.
+%description embedded -l pl.UTF-8
+Ten pakiet zawiera bibliotekę, którą można osadzać w aplikacjach w
+celu obsługi PHP jako języka skryptowego.
+
%package program
Summary: /usr/bin/php symlink
Summary(pl.UTF-8): Dowiązanie symboliczne /usr/bin/php
%endif
%{?with_pcre:Requires: pcre-devel >= 8.10}
Requires: shtool
+Obsoletes: php-devel
Obsoletes: php-pear-devel
Obsoletes: php4-devel
+Obsoletes: php52-devel
%description devel
The php-devel package lets you compile dynamic extensions to PHP.
Group: Libraries
URL: http://php.net/manual/en/book.sqlite3.php
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Provides: php(sqlite3)
+Provides: php(sqlite3) = %{sqlite3ver}
%description sqlite3
SQLite is a C library that implements an embeddable SQL database
Moduł PHP umożliwiający używanie kompresji zlib.
%prep
-%setup -q -n %{name}-%{version}RC2
+%setup -q -n %{orgname}-%{version}
# prep for suhosin patch
%undos Zend/Zend.dsp Zend/ZendTS.dsp
%patch0 -p1
# probably pointless.
%{__rm} ext/standard/tests/file/disk_free_space_basic.phpt
-sh -xe %{_sourcedir}/skip-tests.sh
+#sh -xe %{_sourcedir}/skip-tests.sh
%build
API=$(awk '/#define PHP_API_VERSION/{print $3}' main/php.h)
: Update the pharver macro and rebuild.
exit 1
fi
+ver=$(sed -n '/#define PHP_SQLITE3_VERSION/{s/.* "//;s/".*$//;p}' ext/sqlite3/php_sqlite3.h)
+if test "$ver" != "%{sqlite3ver}"; then
+ : Error: Upstream Sqlite3 version is now ${ver}, expecting %{sqlite3ver}.
+ : Update the sqlite3ver macro and rebuild.
+ exit 1
+fi
ver=$(sed -n '/#define PHP_ZIP_VERSION_STRING /{s/.* "//;s/".*$//;p}' ext/zip/php_zip.h)
if test "$ver" != "%{zipver}"; then
: Error: Upstream ZIP version is now ${ver}, expecting %{zipver}.
%endif
%{?with_mhash:--with-mhash=yes} \
--with-mysql-sock=/var/lib/mysql/mysql.sock \
- --with-pdo-mysql=shared%{?with_mysqlnd:,mysqlnd} \
+ --with-pdo-mysql=shared,%{!?with_mysqlnd:/usr}%{?with_mysqlnd:mysqlnd} \
%{?with_oci8:--with-pdo-oci=shared%{?with_instantclient:,instantclient,%{_libdir}}} \
%{?with_odbc:--with-pdo-odbc=shared,unixODBC,/usr} \
%{?with_pgsql:--with-pdo-pgsql=shared} \
--with-mcrypt=shared \
%{?with_mm:--with-mm} \
%{?with_mssql:--with-mssql=shared} \
- %{?with_mysqlnd:--with-mysqlnd=shared} \
- --with-mysql=shared%{?with_mysqlnd:,mysqlnd} \
- %{?with_mysqli:--with-mysqli=shared%{?with_mysqlnd:,mysqlnd}} \
+ %{?with_mysqlnd:--enable-mysqlnd=shared} \
+ --with-mysql=shared,%{!?with_mysqlnd:/usr}%{?with_mysqlnd:mysqlnd} \
+ %{?with_mysqli:--with-mysqli=shared,%{!?with_mysqlnd:/usr/bin/mysql_config}%{?with_mysqlnd:mysqlnd}} \
%{?with_oci8:--with-oci8=shared%{?with_instantclient:,instantclient,%{_libdir}}} \
%{?with_openssl:--with-openssl=shared} \
%{?with_kerberos5:--with-kerberos} \
done
# as we build each SAPI in own make, adjust php-config.in forehead
-sapis=$(awk '/^PHP_SAPI = /{print $3}' Makefile.* | sort -u | xargs)
-sed -i -e "s,@PHP_INSTALLED_SAPIS@,$sapis," "scripts/php-config.in"
+sapis=$(%{__sed} -rne 's/^PHP_INSTALLED_SAPIS = (.+)/\1/p' Makefile.* | tr ' ' '\n' | sort -u | xargs)
+%{__sed} -i -e "s,@PHP_INSTALLED_SAPIS@,$sapis," scripts/php-config.in
# must make libphp_common first, so modules can link against it.
cp -af php_config.h.cli main/php_config.h
%if %{with cgi}
cp -pf php_config.h.cgi-fcgi main/php_config.h
%{__make} -f Makefile.cgi-fcgi
-[ "$(echo '<?=php_sapi_name();' | ./sapi/cgi/php-cgi -qn)" = cgi-fcgi ] || exit 1
+[ "$(echo '<?=php_sapi_name();' | ./sapi/cgi/php-cgi -qn)" = "cgi-fcgi" ]
%endif
# PHP FPM
%if %{with fpm}
cp -pf php_config.h.fpm main/php_config.h
%{__make} -f Makefile.fpm
- ./sapi/fpm/php-fpm -qn -m > /dev/null
+./sapi/fpm/php-fpm -n -m
+[ $(./sapi/fpm/php-fpm -n -m | grep cgi-fcgi) = "cgi-fcgi" ]
%endif
# CLI
cp -pf php_config.h.cli main/php_config.h
%{__make} -f Makefile.cli
-[ "$(echo '<?=php_sapi_name();' | ./sapi/cli/php -qn)" = cli ] || exit 1
+[ "$(echo '<?=php_sapi_name();' | ./sapi/cli/php -qn)" = "cli" ]
# check for stupid xml parse breakage where < and > just get lost in parse result
./sapi/cli/php -n -dextension_dir=modules -dextension=xml.so -r '$p = xml_parser_create(); xml_parse_into_struct($p, "<x><</x>", $vals, $index); exit((int )empty($vals[0]["value"]));'
# install litespeed sapi
%if %{with litespeed}
-libtool --mode=install install -p sapi/litespeed/php $RPM_BUILD_ROOT%{_sbindir}/php.litespeed
+libtool --mode=install install -p sapi/litespeed/php $RPM_BUILD_ROOT%{_sbindir}/%{name}.litespeed
%endif
libtool --mode=install install -p libphp_common.la $RPM_BUILD_ROOT%{_libdir}
# install CGI/FCGI
%if %{with cgi}
# install-cgi
-libtool --mode=install install -p sapi/cgi/php-cgi $RPM_BUILD_ROOT%{_bindir}/php.cgi
-ln -sf php.cgi $RPM_BUILD_ROOT%{_bindir}/php.fcgi
+libtool --mode=install install -p sapi/cgi/php-cgi $RPM_BUILD_ROOT%{_bindir}/%{name}.cgi
+ln -sf %{name}.cgi $RPM_BUILD_ROOT%{_bindir}/%{name}.fcgi
cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini
%endif
# install FCGI PM
%if %{with fpm}
install -d $RPM_BUILD_ROOT{%{_sysconfdir}/fpm.d,%{_sbindir}}
-libtool --mode=install install -p sapi/fpm/php-fpm $RPM_BUILD_ROOT%{_sbindir}
-cp -p sapi/fpm/php-fpm.8 $RPM_BUILD_ROOT%{_mandir}/man8
+libtool --mode=install install -p sapi/fpm/php-fpm $RPM_BUILD_ROOT%{_sbindir}/%{name}-fpm
+cp -p sapi/fpm/php-fpm.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}-fpm.8
cp -p sapi/fpm/php-fpm.conf $RPM_BUILD_ROOT%{_sysconfdir}
install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/php-fpm
+install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-fpm
+%{__sed} -i -e '
+ s#/usr/lib/php#%{php_extensiondir}#
+ s#/etc/php#%{_sysconfdir}#
+ s#@processname@#%{name}-fpm#g
+' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-fpm $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf
install -d $RPM_BUILD_ROOT/etc/logrotate.d
-cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/php-fpm
+cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm
%endif
# install Embedded API
%endif
# install CLI
-libtool --mode=install install -p sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/php.cli
-cp -p sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/php.1
-echo ".so php.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.cli.1
-ln -sf php.cli $RPM_BUILD_ROOT%{_bindir}/php
+libtool --mode=install install -p sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/%{name}
+cp -p sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
+echo ".so %{name}.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.1
+ln -sf %{name} $RPM_BUILD_ROOT%{_bindir}/php
-sed -e 's#%{_prefix}/lib/php#%{_libdir}/php#g' php.ini > $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
+cp -p php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/php-cli.ini
cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/browscap.ini
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.la
%endif
+# ensure that paths are correct for current php version and arch
+grep -El '/etc/php/|/usr/lib/php/' %{_sysconfdir}/*.ini | xargs -r \
+%{__sed} -i -e '
+ s#/usr/lib/php#%{php_extensiondir}#
+ s#/etc/php#%{_sysconfdir}#
+'
+
install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
cp -p conf.d/*.ini $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
%clean
rm -rf $RPM_BUILD_ROOT
-%post -n apache1-mod_php
+%post -n apache1-mod_%{name}
if [ "$1" = "1" ]; then
%service -q apache restart
fi
-%postun -n apache1-mod_php
+%postun -n apache1-mod_%{name}
if [ "$1" = "0" ]; then
%service -q apache restart
fi
-%post -n apache-mod_php
+%post -n apache-mod_%{name}
if [ "$1" = "1" ]; then
%service -q httpd restart
fi
-%postun -n apache-mod_php
+%postun -n apache-mod_%{name}
if [ "$1" = "0" ]; then
%service -q httpd restart
fi
%useradd -u 51 -r -s /bin/false -c "HTTP User" -g http http
%post fpm
-/sbin/chkconfig --add php-fpm
-%service php-fpm restart
+/sbin/chkconfig --add %{name}-fpm
+%service %{name}-fpm restart
%preun fpm
if [ "$1" = 0 ]; then
- %service php-fpm stop
- /sbin/chkconfig --del php-fpm
+ %service %{name}-fpm stop
+ /sbin/chkconfig --del %{name}-fpm
fi
%postun fpm
[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
[ ! -f /etc/httpd/conf.d/??_mod_php.conf ] || %service -q httpd restart
-%if %{with apache1}
-%triggerpostun -n apache1-mod_php -- php < 4:5.0.4-9.11
-sed -i -e '
- /^AddType application\/x-httpd-php \.php/s,^,#,
- /^\(Add\|Load\)Module.*php5\.\(so\|c\)/d
-' /etc/apache/apache.conf
-%service -q apache restart
-%endif
-
-%if %{with apache2}
-%triggerpostun -n apache-mod_php -- php < 4:5.0.4-7.1
-# for fixed php-SAPI.ini, the poor php-apache.ini was never read for apache2
-if [ -f %{_sysconfdir}/php-apache.ini.rpmsave ]; then
- cp -f %{_sysconfdir}/php-apache2handler.ini{,.rpmnew}
- mv -f %{_sysconfdir}/php-apache.ini.rpmsave %{_sysconfdir}/php-apache2handler.ini
-fi
-%endif
-
# common macros called at extension post/postun scriptlet
%define extension_scripts() \
%post %1 \
%extension_scripts odbc
%extension_scripts openssl
%extension_scripts pcre
+%extension_scripts pdo
%extension_scripts pdo-dblib
%extension_scripts pdo-firebird
+%extension_scripts pdo-oci
%extension_scripts pdo-mysql
%extension_scripts pdo-odbc
%extension_scripts pdo-pgsql
%extension_scripts pdo-sqlite
%extension_scripts pgsql
%extension_scripts phar
+%extension_scripts pcntl
%extension_scripts posix
%extension_scripts pspell
%extension_scripts recode
%extension_scripts session
%extension_scripts shmop
+%extension_scripts simplexml
%extension_scripts snmp
%extension_scripts soap
%extension_scripts sockets
%extension_scripts zip
%extension_scripts zlib
-%triggerun bcmath -- %{name}-bcmath < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*bcmath\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun calendar -- %{name}-calendar < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*calendar\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun ctype -- %{name}-ctype < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ctype\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun curl -- %{name}-curl < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*curl\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun dba -- %{name}-dba < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*dba\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun dom -- %{name}-dom < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*dom\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun exif -- %{name}-exif < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*exif\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun ftp -- %{name}-ftp < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ftp\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun gd -- %{name}-gd < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*gd\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun gettext -- %{name}-gettext < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*gettext\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun gmp -- %{name}-gmp < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*gmp\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun iconv -- %{name}-iconv < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*iconv\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun imap -- %{name}-imap < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*imap\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun interbase -- %{name}-interbase < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*interbase\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun ldap -- %{name}-ldap < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ldap\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun mbstring -- %{name}-mbstring < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mbstring\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun mcrypt -- %{name}-mcrypt < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mcrypt\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun mssql -- %{name}-mssql < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mssql\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun mysql -- %{name}-mysql < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mysql\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun mysqli -- %{name}-mysqli < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mysqli\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun oci8 -- %{name}-oci8 < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*oci8\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun odbc -- %{name}-odbc < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*odbc\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun openssl -- %{name}-openssl < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*openssl\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun pcntl -- %{name}-pcntl < 4:5.1.2-9.5
-if [ -f %{_sysconfdir}/php-cgi.ini ]; then
- %{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pcntl\.so/d' %{_sysconfdir}/php-cgi.ini
-fi
-if [ -f %{_sysconfdir}/php-cli.ini ]; then
- %{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pcntl\.so/d' %{_sysconfdir}/php-cli.ini
-fi
-
-%triggerun pcre -- %{name}-pcre < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pcre\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun pgsql -- %{name}-pgsql < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pgsql\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun posix -- %{name}-posix < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*posix\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun pspell -- %{name}-pspell < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*pspell\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun readline -- %{name}-readline < 4:5.1.2-9.5
-if [ -f %{_sysconfdir}/php-cgi.ini ]; then
- %{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*readline\.so/d' %{_sysconfdir}/php-cgi.ini
-fi
-if [ -f %{_sysconfdir}/php-cli.ini ]; then
- %{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*readline\.so/d' %{_sysconfdir}/php-cli.ini
-fi
-
-%triggerun recode -- %{name}-recode < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*recode\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun session -- %{name}-session < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*session\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun shmop -- %{name}-shmop < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*shmop\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun snmp -- %{name}-snmp < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*snmp\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun soap -- %{name}-soap < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*soap\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun sockets -- %{name}-sockets < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sockets\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun sybase-ct -- %{name}-sybase-ct < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sybase-ct\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun sysvmsg -- %{name}-sysvmsg < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sysvmsg\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun sysvsem -- %{name}-sysvsem < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sysvsem\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun sysvshm -- %{name}-sysvshm < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*sysvshm\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun tidy -- %{name}-tidy < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*tidy\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun wddx -- %{name}-wddx < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*wddx\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun xml -- %{name}-xml < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*xml\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun xmlrpc -- %{name}-xmlrpc < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*xmlrpc\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun xsl -- %{name}-xsl < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*xsl\.so/d' %{_sysconfdir}/php.ini
-
-%triggerun zlib -- %{name}-zlib < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*zlib\.so/d' %{_sysconfdir}/php.ini
-
%if %{with apache1}
-%files -n apache1-mod_php
+%files -n apache1-mod_%{name}
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/apache/conf.d/*_mod_php.conf
%dir %{_sysconfdir}/apache.d
%endif
%if %{with apache2}
-%files -n apache-mod_php
+%files -n apache-mod_%{name}
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/httpd/conf.d/*_mod_php.conf
%dir %{_sysconfdir}/apache2handler.d
%if %{with litespeed}
%files litespeed
%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/php.litespeed
+%attr(755,root,root) %{_sbindir}/%{name}.litespeed
%endif
%if %{with cgi}
%defattr(644,root,root,755)
%dir %{_sysconfdir}/cgi-fcgi.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cgi-fcgi.ini
-%attr(755,root,root) %{_bindir}/php.cgi
-%attr(755,root,root) %{_bindir}/php.fcgi
+%attr(755,root,root) %{_bindir}/%{name}.cgi
+%attr(755,root,root) %{_bindir}/%{name}.fcgi
%endif
%if %{with embed}
%defattr(644,root,root,755)
%dir %{_sysconfdir}/cli.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cli.ini
-%attr(755,root,root) %{_bindir}/php.cli
-%{_mandir}/man1/php.1*
-%{_mandir}/man1/php.cli.1*
+%attr(755,root,root) %{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1*
%files program
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/php
+%{_mandir}/man1/php.1*
%if %{with fpm}
%files fpm
%doc sapi/fpm/{CREDITS,LICENSE}
%dir %{_sysconfdir}/fpm.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-fpm.conf
-%attr(755,root,root) %{_sbindir}/php-fpm
-%{_mandir}/man8/php-fpm.8*
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/php-fpm
-%attr(754,root,root) /etc/rc.d/init.d/php-fpm
+%attr(755,root,root) %{_sbindir}/%{name}-fpm
+%{_mandir}/man8/%{name}-fpm.8*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}-fpm
+%attr(754,root,root) /etc/rc.d/init.d/%{name}-fpm
%endif
%files common
%files dba
%defattr(644,root,root,755)
+%doc ext/dba/{CREDITS,README}
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dba.ini
%attr(755,root,root) %{php_extensiondir}/dba.so
%files tests
%defattr(644,root,root,755)
+%dir %{php_data_dir}/tests
%dir %{php_data_dir}/tests/php
%{php_data_dir}/tests/php/basic
%{php_data_dir}/tests/php/classes