X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php.spec;h=658a60a709f0a4b115d7ce0229b6d157f511b0c6;hb=a8cedba;hp=c6925bfc05070c836552aeef1096bb4eb2c69c29;hpb=ff9f735257770b5ae6bf84d286188cc702658406;p=packages%2Fphp.git diff --git a/php.spec b/php.spec index c6925bf..2f7380f 100644 --- a/php.spec +++ b/php.spec @@ -1,26 +1,19 @@ # TODO 5.4: # - do not remove PatchX: definitions until merged to HEAD, needed for tracking their state # - check php-sapi-ini-file.patch for safe mode removal -# - enable suhoshin patch (needs api porting) -# - enable litespeed (needs api porting) # - update imap annotations patch (needs api porting) # - update imap myrights patch (needs api porting) -# - 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 # TODO: +# - fileinfo extension bundles magic db in library: data_file.c (dump of magic.mgc) is 14M +# - 2.3M fileinfo.so php54-fileinfo-5.4.6-0.15.x86_64 +# - 2.3M fileinfo.so php-fileinfo-5.3.16-1.x86_64 +# - 13K fileinfo.so php-pecl-fileinfo-1.0.4-8.amd64 # - ttyname_r() misdetected http://bugs.php.net/bug.php?id=48820 # - wddx: restore session support (not compiled in due DL extension check) # - deal with modules removed from php and not moved to PECL, still not obsoleted anywhere @@ -46,25 +39,41 @@ # Reflection # # Conditional build: -%bcond_with interbase_inst # use InterBase install., not Firebird (BR: proprietary libs) -%bcond_with oci8 # with Oracle oci8 extension module (BR: proprietary libs) -%bcond_with instantclient # build Oracle oci8 extension module against oracle-instantclient package -%bcond_with system_gd # with system gd (we prefer internal since it enables few more features) -%bcond_with system_libzip # with system libzip (reported broken currently) +# - packaging options +%bcond_without alternatives # use alternatives system to select default phar and php-fpm +%bcond_with default_php # build this PHP as default PHP in system (disables alternatives) +# - General options: +%bcond_without embed # disable building Embedded API +%bcond_with gcov # Enable Code coverage reporting +%bcond_without kerberos5 # without Kerberos5 support +%bcond_with suhosin # with suhosin patch, has little point in PHP>=5.3, see https://github.com/stefanesser/suhosin/issues/42#issuecomment-41728178 +%bcond_with tests # default off; test process very often hangs on builders, approx run time 45m; perform "make test" +%bcond_with type_hints # experimental support for strict typing/casting +%bcond_with zts # Zend Thread Safety +# - SAPI +%bcond_without apache1 # disable building Apache 1.3.x SAPI +%bcond_without apache2 # disable building Apache 2.x SAPI +%bcond_without cgi # disable CGI/FCGI SAPI +%bcond_without fpm # disable FPM SAPI +%bcond_without litespeed # build litespeed SAPI +# - Extensions +%bcond_without bcmath # without bcmath extension module +%bcond_without bz2 # without bz2 extension module +%bcond_without calendar # without calendar extension module +%bcond_without ctype # without ctype extension module %bcond_without curl # without CURL extension module -%bcond_without filter # without filter extension module %bcond_without enchant # without Enchant extension module +%bcond_without filter # without filter extension module %bcond_without imap # without IMAP extension module %bcond_without interbase # without InterBase extension module -%bcond_without kerberos5 # without Kerberos5 support -%bcond_with litespeed # build litespeed module +%bcond_without intl # without Intl extension module %bcond_without ldap # without LDAP extension module %bcond_without mhash # without mhash extension (supported by hash extension) -%bcond_without mm # without mm support for session storage %bcond_without mssql # without MS SQL extension module # don't turn it on by default; see TODO item for mysqlnd in this spec %bcond_with mysqlnd # with mysqlnd support in mysql related extensions %bcond_without mysqli # without mysqli support (Requires mysql > 4.1) +%bcond_with oci # with Oracle oci8 extension module (BR: proprietary libs) %bcond_without odbc # without ODBC extension module %bcond_without openssl # without OpenSSL support and OpenSSL extension (module) %bcond_without pcre # without PCRE extension module @@ -80,20 +89,16 @@ %bcond_without tidy # without Tidy extension module %bcond_without wddx # without WDDX extension module %bcond_without xmlrpc # without XML-RPC extension module -%bcond_without apache1 # disable building Apache 1.3.x SAPI -%bcond_without apache2 # disable building Apache 2.x SAPI -%bcond_with zts # Zend Thread Safety -%bcond_without cgi # disable CGI/FCGI SAPI -%bcond_without fpm # disable FPM -%bcond_with embed # disable Embedded API -%bcond_with suhosin # with suhosin patch -%bcond_with tests # default off; test process very often hangs on builders, approx run time 45m; perform "make test" -%bcond_with gcov # Enable Code coverage reporting -%bcond_with type_hints # experimental support for strict typing/casting +# extensions options +%bcond_without instantclient # build Oracle oci8 extension module against oracle-instantclient package +%bcond_with interbase_inst # use InterBase install., not Firebird (BR: proprietary libs) +%bcond_with mm # without mm support for session storage +%bcond_with system_gd # with system gd (imageantialias function is missing then) +%bcond_with system_libzip # with system libzip (reported broken currently) +%bcond_without webp # Without WebP support in GD extension (imagecreatefromwebp) %define apxs1 /usr/sbin/apxs1 %define apxs2 /usr/sbin/apxs -%define litespeed_version 5.5 # disable all sapis %if %{with gcov} @@ -103,17 +108,21 @@ %undefine with_litespeed %endif +%if %{with default_php} +%undefine with_alternatives +%endif + # mm is not thread safe %if %{with zts} %undefine with_mm %endif -%ifnarch %{ix86} %{x8664} sparc sparcv9 alpha +%ifnarch %{ix86} %{x8664} x32 sparc sparcv9 alpha # ppc disabled (broken on th-ppc) %undefine with_interbase %endif -%ifnarch %{ix86} %{x8664} +%ifnarch %{ix86} %{x8664} x32 # unsupported, see sapi/cgi/fpm/fpm_atomic.h %undefine with_fpm %endif @@ -129,10 +138,10 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %undefine with_filter %endif +%define rel 12 %define orgname php -%define php_suffix 54 - -%define rel 0.4 +%define ver_suffix 54 +%define php_suffix %{!?with_default_php:%{ver_suffix}} Summary: PHP: Hypertext Preprocessor Summary(fr.UTF-8): Le langage de script embarque-HTML PHP Summary(pl.UTF-8): Język skryptowy PHP @@ -140,27 +149,25 @@ 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: %{orgname}%{php_suffix} -Version: 5.4.5 +Version: 5.4.45 Release: %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci} Epoch: 4 -License: PHP +# All files licensed under PHP version 3.01, except +# Zend is licensed under Zend +# TSRM is licensed under BSD +License: PHP 3.01 and Zend and BSD Group: Libraries Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2 -# Source0-md5: ffcc7f4dcf2b79d667fe0c110e6cb724 +# Source0-md5: 185f67f1ca652b18bc0cca9d7edbde7c 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: %{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/%{orgname}-litespeed-%{litespeed_version}.tgz -# Source15-md5: 9d58485d5fd6b5f5fefcec41b9ce283e Patch0: %{orgname}-shared.patch Patch1: %{orgname}-pldlogo.patch Patch2: %{orgname}-mail.patch @@ -170,7 +177,7 @@ 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 +Patch9: php-bug-71475.patch Patch10: %{orgname}-ini.patch Patch11: embed.patch %if %{with type_hints} @@ -219,8 +226,12 @@ Patch60: %{orgname}-oracle-instantclient.patch Patch62: mcrypt-libs.patch 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 +Patch66: php-db.patch +Patch67: mysql-lib-ver-mismatch.patch +Patch68: x32.patch +Patch70: libvpx2.patch +Patch71: zend_operators_from_5.5.patch URL: http://www.php.net/ %{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}} %{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0} @@ -234,10 +245,9 @@ BuildRequires: db-devel >= 4.0 BuildRequires: elfutils-devel %{?with_enchant:BuildRequires: enchant-devel >= 1.1.3} #BuildRequires: fcgi-devel -#BuildRequires: flex %{?with_kerberos5:BuildRequires: heimdal-devel} -%{?with_system_libzip:BuildRequires: libzip-devel >= 0.10-3} -BuildRequires: mysql-devel +%{?with_system_libzip:BuildRequires: libzip-devel >= 0.10.1-2} +%{!?with_mysqlnd:BuildRequires: mysql-devel} BuildRequires: pkgconfig BuildRequires: sed >= 4.0 %if %{with mssql} || %{with sybase_ct} @@ -251,16 +261,16 @@ BuildRequires: gd-devel(imagerotate) = 5.2.0 BuildRequires: gdbm-devel BuildRequires: gmp-devel %{?with_imap:BuildRequires: imap-devel >= 1:2007e-2} -BuildRequires: libicu-devel +%{?with_intl:BuildRequires: libicu-devel} BuildRequires: libjpeg-devel BuildRequires: libltdl-devel >= 1.4 BuildRequires: libmcrypt-devel >= 2.4.4 BuildRequires: libpng-devel >= 1.0.8 #BuildRequires: libtiff-devel -BuildRequires: libvpx-devel +%{?with_webp:BuildRequires: libvpx-devel} BuildRequires: tokyocabinet-devel %if "%{pld_release}" != "ac" -BuildRequires: libtool >= 2:2.2 +BuildRequires: libtool >= 2:2.4.6 %else BuildRequires: libtool >= 1.4.3 %endif @@ -275,7 +285,7 @@ BuildRequires: openssl-devel >= 0.9.7d %{?with_gcov:BuildRequires: lcov} %{?with_snmp:%{?with_tests:BuildRequires: mibs-net-snmp}} %{?with_snmp:BuildRequires: net-snmp-devel >= 5.0.7} -%{?with_instantclient:BuildRequires: oracle-instantclient-devel} +%{?with_oci:%{?with_instantclient:BuildRequires: oracle-instantclient-devel}} BuildRequires: pam-devel %{?with_pcre:BuildRequires: pcre-devel >= 8.10} BuildRequires: pkgconfig @@ -304,7 +314,6 @@ BuildRequires: apr-util-devel >= 1:1.0.0 %endif %if %{with fpm} #BuildRequires: judy-devel -BuildRequires: libevent-devel >= 1.4.7-3 %endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -335,7 +344,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %undefine with_ccache %endif -%if %{with oci8} +%if %{with oci} # ORACLE_HOME is required for oci8 ext to build %define _preserve_env %_preserve_env_base ORACLE_HOME %endif @@ -393,7 +402,7 @@ PHP - це мова написання скриптів, що вбудовуют роботи з базами даних є доволі простим. Найбільш популярне використання PHP - заміна для CGI скриптів. -%package -n apache1-mod_php%{php_suffix} +%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 @@ -405,13 +414,13 @@ Provides: webserver(php) = %{version} Obsoletes: apache-mod_php < 1:4.1.1 Obsoletes: phpfi -%description -n apache1-mod_php%{php_suffix} +%description -n apache1-mod_%{name} PHP as DSO module for Apache 1.3.x. -%description -n apache1-mod_php%{php_suffix} -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%{php_suffix} +%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 @@ -421,10 +430,10 @@ Requires: apache-mod_mime Provides: webserver(php) = %{version} Obsoletes: phpfi -%description -n apache-mod_php%{php_suffix} +%description -n apache-mod_%{name} PHP as DSO module for Apache 2.x. -%description -n apache-mod_php%{php_suffix} -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 @@ -432,6 +441,7 @@ Summary: PHP for litespeed HTTP server Summary(pl.UTF-8): PHP dla serwera HTTP litespeed Group: Development/Languages/PHP Requires: %{name}-common = %{epoch}:%{version}-%{release} +Provides: php(litespeed) Provides: webserver(php) = %{version} %description litespeed @@ -448,8 +458,11 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release} Provides: %{name}-fcgi = %{epoch}:%{version}-%{release} Provides: php(cgi) Provides: php(fcgi) -Provides: webserver(php) +Provides: webserver(php) = %{version} Obsoletes: php-fcgi < 4:5.3.0 +%if "%{pld_release}" != "ac" +Conflicts: logrotate < 3.8.0 +%endif %description cgi PHP as CGI or FastCGI program. @@ -506,8 +519,10 @@ Requires(postun): /usr/sbin/userdel Requires(pre): /bin/id Requires(pre): /usr/sbin/useradd Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: libevent >= 1.4.7-3 +%{?with_alternatives:Requires: alternatives} +Requires: php-dirs >= 1.4-2 Requires: rc-scripts +Provides: php(fpm) Provides: user(http) Provides: webserver(php) = %{version} @@ -526,26 +541,28 @@ Group: Libraries Requires(post): sed >= 4.0 # because of dlclose() bugs in glibc <= 2.3.4 causing SEGVs on exit Requires: glibc >= 6:2.3.5 -Requires: php-dirs +Requires: php-dirs >= 1.4 Requires: rpm-whiteout >= 1.28 Requires: tzdata +Provides: %{name}(debug) = %{php_debug} +Provides: %{name}(modules_api) = %{php_api_version} +Provides: %{name}(thread-safety) = %{zend_zts} +Provides: %{name}(zend_extension_api) = %{zend_extension_api} +Provides: %{name}(zend_module_api) = %{zend_module_api} +Provides: %{name}-core +Provides: %{name}-date +Provides: %{name}-ereg +Provides: %{name}-reflection +Provides: %{name}-standard +Provides: php(core) = %{version} Provides: php(date) Provides: php(ereg) -Provides: php(hash) Provides: php(libxml) -Provides: php(modules_api) = %{php_api_version} Provides: php(reflection) Provides: php(standard) -Provides: php(zend_extension_api) = %{zend_extension_api} -Provides: php(zend_module_api) = %{zend_module_api} -Provides: php-date -Provides: php-ereg -Provides: php-reflection -Provides: php-standard -Provides: php5(debug) = %{php_debug} -Provides: php5(thread-safety) = %{zend_zts} %{!?with_mysqlnd:Obsoletes: php-mysqlnd} %{?with_pcre:%requires_ge_to pcre pcre-devel} +Suggests: browscap Obsoletes: php-pecl-domxml Conflicts: php4-common < 3:4.4.4-8 Conflicts: rpm < 4.4.2-0.2 @@ -575,16 +592,21 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: autoconf >= 2.13 Requires: automake %if "%{pld_release}" != "ac" -Requires: libtool >= 2:2.2 +Requires: libtool >= 2:2.4.6 %else Requires: libtool %endif %{?with_pcre:Requires: pcre-devel >= 8.10} Requires: shtool +Provides: php-devel = %{epoch}:%{version}-%{release} Obsoletes: php-devel Obsoletes: php-pear-devel Obsoletes: php4-devel Obsoletes: php52-devel +Obsoletes: php53-devel +Obsoletes: php55-devel +Obsoletes: php56-devel +Obsoletes: php70-devel %description devel The php-devel package lets you compile dynamic extensions to PHP. @@ -723,8 +745,8 @@ URL: http://www.php.net/manual/en/book.dom.php Requires: %{name}-common = %{epoch}:%{version}-%{release} Provides: php(dom) # it has some compatibility functions +Provides: %{name}-domxml = %{epoch}:%{version}-%{release} Provides: php(domxml) -Provides: php-domxml = %{epoch}:%{version}-%{release} Obsoletes: php-domxml <= 3:4.3.8-1 %description dom @@ -1398,17 +1420,19 @@ Moduł PHP umożliwiający dostęp do bazy danych PostgreSQL. Um módulo para aplicações PHP que usam bancos de dados postgresql. %package phar -Summary: phar database module for PHP +Summary: Phar archive module for PHP Summary(pl.UTF-8): Moduł phar dla PHP Group: Libraries URL: http://www.php.net/manual/en/book.phar.php Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: %{name}-spl = %{epoch}:%{version}-%{release} +%{?with_alternatives:Requires: alternatives} +Suggests: %{name}-cli # zlib is required by phar program, but as phar cli is optional should the dep be too Suggests: %{name}-zlib -Suggests: php-program Provides: php(phar) = %{pharver} Obsoletes: php-pecl-phar < %{pharver} +Conflicts: php-ioncube < 4.0.9 %description phar This is a dynamic shared object (DSO) for PHP that will add phar @@ -1488,6 +1512,7 @@ Group: Libraries Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: %{name}-spl = %{epoch}:%{version}-%{release} Suggests: %{name}-hash = %{epoch}:%{version}-%{release} +Suggests: tmpwatch Provides: php(session) %description session @@ -1844,7 +1869,7 @@ Summary(pl.UTF-8): Zarządzanie archiwami zip Group: Libraries URL: http://www.php.net/manual/en/book.zip.php Requires: %{name}-common = %{epoch}:%{version}-%{release} -%{?with_system_libzip:Requires: libzip >= 0.10-3} +%{?with_system_libzip:Requires: libzip >= 0.10.1-2} Provides: php(zip) = %{zipver} Obsoletes: php-pecl-zip < %{zipver} @@ -1872,8 +1897,6 @@ Moduł PHP umożliwiający używanie kompresji zlib. %prep %setup -q -n %{orgname}-%{version} -# prep for suhosin patch -%undos Zend/Zend.dsp Zend/ZendTS.dsp %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -1882,8 +1905,8 @@ Moduł PHP umożliwiający używanie kompresji zlib. %patch5 -p1 %patch6 -p1 %patch8 -p1 -%patch7 -p1 %patch9 -p1 +%patch7 -p1 cp -p php.ini-production php.ini %patch10 -p1 %if %{with type_hints} @@ -1923,6 +1946,7 @@ cp -p php.ini-production php.ini #%patch46 -p1 # imap myrights. fixme %if %{with suhosin} %patch47 -p1 +%patch68 -p1 %endif %patch50 -p1 %patch51 -p1 @@ -1935,10 +1959,16 @@ cp -p php.ini-production php.ini %patch62 -p1 %patch63 -p1 %{?with_system_libzip:%patch65 -p1} -%{__rm} -r sapi/litespeed -gzip -dc %{SOURCE15} | tar xf - -C sapi/ +%patch66 -p1 +%patch67 -p1 +%patch70 -p1 + +%ifarch x32 +# asm part of zend_operators.h of php-5.5 +%patch71 -p1 +%endif -sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4 +%{__sed} -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4 # cleanup backups after patching find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f @@ -1970,7 +2000,22 @@ sed -i -e 's#-fvisibility=hidden##g' configure* # disable broken tests # says just "Terminated" twice and fails -mv sapi/cli/tests/022.phpt{,.broken} +%{__mv} sapi/cli/tests/022.phpt{,.broken} + +# really dumb test, executable binary name is .libs/ something when building +# https://bugs.php.net/bug.php?id=54514 +%{__mv} tests/basic/bug54514.phpt{,.disable} + +# breaks whole testsuite unexpectedly: +# Fatal error: Call to undefined function gzencode() in run-tests.php on line 1714 +# probably broken as zlib is built as shared +%{__mv} ext/soap/tests/server019.phpt{,disable} +# Fatal error: Call to undefined function gzcompress() in run-tests.php on line 1728 +%{__mv} ext/soap/tests/server020.phpt{,disable} + +# runs out of memory and kills carme vserver +# PASS Bug #39438 (Fatal error: Out of memory) [Zend/tests/bug39438.phpt] +%{__mv} Zend/tests/bug39438.phpt{,.disable} # php-5.3.3/ext/standard/tests/file/statpage.phpt %{__rm} ext/standard/tests/file/statpage.phpt @@ -1980,7 +2025,27 @@ mv sapi/cli/tests/022.phpt{,.broken} # probably pointless. %{__rm} ext/standard/tests/file/disk_free_space_basic.phpt -#sh -xe %{_sourcedir}/skip-tests.sh +%ifarch %{x8664} +# all pdo_sqlite, sqlite3 tests die with Aborted on carme +%{__rm} -r ext/pdo_sqlite/tests +%{__rm} -r ext/sqlite3/tests +%endif + +# skip XFAILs +# no point testing stuff that is knowingly broken +find -name '*.phpt' | xargs grep XFAIL -l | xargs rm -v + +env \ +%ifarch %{ix86} +ix86= x8664=: +%endif +%ifarch %{x8664} +ix86=: x8664= \ +%endif +%ifarch x32 +ix86=: x8664=: \ +%endif + sh -xe %{_sourcedir}/skip-tests.sh %build API=$(awk '/#define PHP_API_VERSION/{print $3}' main/php.h) @@ -2126,6 +2191,7 @@ for sapi in $sapis; do esac %configure \ + EXTRA_LDFLAGS="%{rpmldflags}" \ $sapi_args \ %if "%{!?configure_cache:0}%{?configure_cache}" == "0" --cache-file=config.cache \ @@ -2146,7 +2212,7 @@ for sapi in $sapis; do --enable-fileinfo=shared \ --enable-ftp=shared \ --enable-gd-native-ttf \ - --enable-intl=shared \ + %{?with_intl:--enable-intl=shared} \ --enable-libxml \ --enable-mbstring=shared,all \ --enable-mbregex \ @@ -2167,12 +2233,12 @@ for sapi in $sapis; do %endif %{?with_mhash:--with-mhash=yes} \ --with-mysql-sock=/var/lib/mysql/mysql.sock \ - --with-pdo-mysql=shared%{?with_mysqlnd:,mysqlnd} \ - %{?with_oci8:--with-pdo-oci=shared%{?with_instantclient:,instantclient,%{_libdir}}} \ + --with-pdo-mysql=shared,%{!?with_mysqlnd:/usr}%{?with_mysqlnd:mysqlnd} \ + %{?with_oci:--with-pdo-oci=shared%{?with_instantclient:,instantclient,%{_libdir}}} \ %{?with_odbc:--with-pdo-odbc=shared,unixODBC,/usr} \ %{?with_pgsql:--with-pdo-pgsql=shared} \ %{?with_pdo_sqlite:--with-pdo-sqlite=shared,/usr} \ - --with-vpx-dir=/usr \ + %{?with_webp:--with-vpx-dir=/usr} \ --without-libexpat-dir \ --enable-posix=shared \ --enable-shared \ @@ -2205,10 +2271,10 @@ for sapi in $sapis; do --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_oci8:--with-oci8=shared%{?with_instantclient:,instantclient,%{_libdir}}} \ + %{?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_oci:--with-oci8=shared%{?with_instantclient:,instantclient,%{_libdir}}} \ %{?with_openssl:--with-openssl=shared} \ %{?with_kerberos5:--with-kerberos} \ --with-tcadb=/usr \ @@ -2243,8 +2309,8 @@ for sapi in $sapis; do 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 @@ -2268,20 +2334,20 @@ cp -af Makefile.cli Makefile %if %{with cgi} cp -pf php_config.h.cgi-fcgi main/php_config.h %{__make} -f Makefile.cgi-fcgi -[ "$(echo ' /dev/null +[ $(./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 '<", $vals, $index); exit((int )empty($vals[0]["value"]));' @@ -2328,11 +2394,6 @@ cp -pf Makefile.cli Makefile exit 1 %endif -%if %{with tests} -# Run tests, using the CLI SAPI -cp -pf php_config.h.cli main/php_config.h -cp -pf Makefile.cli Makefile - cat <<'EOF' > run-tests.sh #!/bin/sh export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 @@ -2343,17 +2404,23 @@ unset TZ LANG LC_ALL || : RUN_TESTS_SETTINGS="-q $*" EOF chmod +x run-tests.sh -./run-tests.sh -w failed.log -s test.log + +%if %{with tests} +# Run tests, using the CLI SAPI +cp -pf php_config.h.cli main/php_config.h +cp -pf Makefile.cli Makefile + +./run-tests.sh -w failed.log -s tests.log # collect failed tests into cleanup script used in prep. -sed -ne '/FAILED TEST SUMMARY/,/^===/p' test.log | sed -e '1,/^---/d;/^===/,$d' > tests-failed.log -sed -ne '/\[.*\]/{s/\(.*\) \[\(.*\)\]/# \1\nmv \2{,.skip}/p}' tests-failed.log \ +sed -ne '/^FAILED TEST SUMMARY/,/^===/p' tests.log | sed -e '1,/^---/d;/^===/,$d' > tests-failed.log +sed -ne '/^via/d;/\[.*\]/{s/\t*\(.*\) \[\(.*\)\]\(.*\)/# \1\3\nmv \2{,.skip}/p}' tests-failed.log \ >> %{_sourcedir}/skip-tests.sh -failed=$(wc -l < tests-failed.log) -if [ "$failed" != 0 ]; then - exit 1 -fi +# if on builders, dump test log +tty -q || cat tests.log + +test ! -s failed.log %endif %install @@ -2365,25 +2432,42 @@ install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}/{apache,cg cp -pf php_config.h.cli main/php_config.h cp -pf Makefile.cli Makefile -%{__make} install \ +%{__make} install -j1 \ + phpbuilddir=%{_libdir}/%{name}/build \ INSTALL_ROOT=$RPM_BUILD_ROOT -# make link relative -ln -sfn phar.phar $RPM_BUILD_ROOT%{_bindir}/phar +%if %{without default_php} +# version the .phar files +%{__mv} $RPM_BUILD_ROOT%{_bindir}/phar{,%{php_suffix}}.phar +%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/phar{,%{php_suffix}}.1 +%endif +%if %{with alternatives} +# touch for ghost +%{__rm} $RPM_BUILD_ROOT%{_bindir}/phar +touch $RPM_BUILD_ROOT%{_bindir}/phar +touch $RPM_BUILD_ROOT%{_mandir}/man1/phar.1 +%endif + +# version suffix +v=$(echo %{version} | cut -d. -f1-2) # install Apache1 DSO module %if %{with apache1} libtool --mode=install install -p sapi/apache/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache1 +%{__mv} $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5{,-$v}.so +ln -s libphp5-$v.so $RPM_BUILD_ROOT%{_libdir}/apache1/mod_php.so %endif # install Apache2 DSO module %if %{with apache2} libtool --mode=install install -p sapi/apache2handler/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache +%{__mv} $RPM_BUILD_ROOT%{_libdir}/apache/libphp5{,-$v}.so +ln -s libphp5-$v.so $RPM_BUILD_ROOT%{_libdir}/apache/mod_php.so %endif # 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} @@ -2399,13 +2483,27 @@ cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini # 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 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 +%if "%{pld_release}" == "ac" +%{__sed} -i -e '/su/d' $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm +%endif + +%if %{with alternatives} +# touch for ghost for alternatives +touch $RPM_BUILD_ROOT%{_sbindir}/php-fpm +%endif + +%{__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,logrotate.d/%{name}-fpm},%{_sysconfdir}/php-fpm.conf} %endif # install Embedded API @@ -2417,18 +2515,14 @@ cp -p sapi/embed/php_embed.h $RPM_BUILD_ROOT%{_includedir}/php/sapi/embed %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 - -sed -e ' - s#/usr/lib/php#%{php_extensiondir}# - s#/etc/php#%{_sysconfdir}# -' php.ini > $RPM_BUILD_ROOT%{_sysconfdir}/php.ini +# versioned suffix is always installed +libtool --mode=install install -p sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/php%{ver_suffix} +cp -p sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/php%{ver_suffix}.1 +echo ".so php%{ver_suffix}.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.1 +ln -sf php%{ver_suffix} $RPM_BUILD_ROOT%{_bindir}/php +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 %if %{with apache1} cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/apache/conf.d/70_mod_php.conf @@ -2442,6 +2536,13 @@ cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.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/' $RPM_BUILD_ROOT%{_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 @@ -2449,20 +2550,23 @@ cp -p conf.d/*.ini $RPM_BUILD_ROOT%{_sysconfdir}/conf.d install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi-fcgi,cli,apache,apache2handler}.d # for CLI SAPI only -mv $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/readline.ini,cli.d} +%{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/readline.ini,cli.d} # use system automake and {lib,sh}tool -%if "%{pld_release}" != "ac" - ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_libdir}/php/build - for i in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do - ln -snf %{_aclocaldir}/${i} $RPM_BUILD_ROOT%{_libdir}/php/build - done - ln -snf %{_datadir}/libtool/config/ltmain.sh $RPM_BUILD_ROOT%{_libdir}/php/build -%else - ln -snf %{_aclocaldir}/libtool.m4 $RPM_BUILD_ROOT%{_libdir}/php/build - ln -snf %{_datadir}/libtool/ltmain.sh $RPM_BUILD_ROOT%{_libdir}/php/build -%endif -ln -snf %{_bindir}/shtool $RPM_BUILD_ROOT%{_libdir}/php/build +ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_libdir}/%{name}/build +ln -snf %{_bindir}/shtool $RPM_BUILD_ROOT%{_libdir}/%{name}/build +for fn in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do + f=%{_aclocaldir}/$fn + test -f $f || continue + ln -snf $f $RPM_BUILD_ROOT%{_libdir}/%{name}/build +done +for fn in ltmain.sh config/ltmain.sh build-aux/ltmain.sh; do + f=/usr/share/libtool/$fn + test -f $f || continue + ln -snf $f $RPM_BUILD_ROOT%{_libdir}/%{name}/build + break +done +sed -i -e '/^phpdir/ s,/php/build,/%{name}/build,' $RPM_BUILD_ROOT%{_bindir}/phpize # for php-pecl-mailparse install -d $RPM_BUILD_ROOT%{_includedir}/php/ext/mbstring @@ -2480,27 +2584,27 @@ sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" $RPM_BUILD_ROOT%{_libdir}/libphp_c sed -i -e "/dependency_libs/ s,/[^ ]*/libs/libphp_common.la,%{_libdir}/libphp_common.la," $RPM_BUILD_ROOT%{_libdir}/libphp5.la %endif # better solution? -sed -i -e 's|libphp_common.la|$(libdir)/libphp_common.la|' $RPM_BUILD_ROOT%{_libdir}/php/build/acinclude.m4 +sed -i -e 's|libphp_common.la|$(libdir)/libphp_common.la|' $RPM_BUILD_ROOT%{_libdir}/%{name}/build/acinclude.m4 %clean rm -rf $RPM_BUILD_ROOT -%post -n apache1-mod_php%{php_suffix} +%post -n apache1-mod_%{name} if [ "$1" = "1" ]; then %service -q apache restart fi -%postun -n apache1-mod_php%{php_suffix} +%postun -n apache1-mod_%{name} if [ "$1" = "0" ]; then %service -q apache restart fi -%post -n apache-mod_php%{php_suffix} +%post -n apache-mod_%{name} if [ "$1" = "1" ]; then %service -q httpd restart fi -%postun -n apache-mod_php%{php_suffix} +%postun -n apache-mod_%{name} if [ "$1" = "0" ]; then %service -q httpd restart fi @@ -2509,13 +2613,19 @@ 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 +%if %{with alternatives} +update-alternatives --install %{_sbindir}/php-fpm php-fpm %{_sbindir}/php%{ver_suffix}-fpm %{ver_suffix} || : +%endif %preun fpm if [ "$1" = 0 ]; then - %service php-fpm stop - /sbin/chkconfig --del php-fpm + %service %{name}-fpm stop + /sbin/chkconfig --del %{name}-fpm +%if %{with alternatives} + update-alternatives --remove php-fpm %{_sbindir}/php-fpm || : +%endif fi %postun fpm @@ -2526,7 +2636,7 @@ fi %post embedded -p /sbin/ldconfig %postun embedded -p /sbin/ldconfig -%post common +%posttrans common # PHP 5.3 requires timezone being setup, try setup it from tzdata if ! grep -q '^date.timezone[[:space:]]*=' %{_sysconfdir}/php.ini && [ -f /etc/sysconfig/timezone ]; then TIMEZONE= @@ -2536,7 +2646,6 @@ if ! grep -q '^date.timezone[[:space:]]*=' %{_sysconfdir}/php.ini && [ -f /etc/s fi fi -%posttrans common # minimizing apache restarts logics. we restart webserver: # # 1. at the end of transaction. (posttrans, feature from rpm 4.4.2) @@ -2550,35 +2659,39 @@ fi [ ! -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_suffix} -- 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_suffix} -- 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 +%triggerpostun common -- %{name}-common < 4:5.4.36-2, php-common < 4:5.4.36-2 +# switch to browscap package if the ini file has original value +%{__sed} -i -e 's#%{_sysconfdir}/browscap.ini#/usr/share/browscap/php_browscap.ini#' %{_sysconfdir}/php.ini +# disable browscap, if optional package not present +if [ ! -e /usr/share/browscap/php_browscap.ini ]; then + %{__sed} -i -e 's#^browscap = /usr/share/browscap/php_browscap.ini#;&#' %{_sysconfdir}/php.ini fi -%endif + +%triggerpostun -n apache1-mod_%{name} -- apache1-mod_%{name} < 4:5.4.45-2 +sed -i -e 's#modules/libphp5.so#modules/mod_php.so#g' /etc/apache/conf.d/*_mod_php.conf + +%triggerpostun -n apache-mod_%{name} -- apache-mod_%{name} < 4:5.4.45-2 +sed -i -e 's#modules/libphp[57].so#modules/mod_php.so#g' /etc/httpd/conf.d/*_mod_php.conf # common macros called at extension post/postun scriptlet -%define extension_scripts() \ -%post %1 \ +%define ext_post \ if [ "$1" = "1" ]; then \ %php_webserver_restart \ fi \ -\ -%postun %1 \ +%{nil} + +%define ext_postun \ if [ "$1" = "0" ]; then \ %php_webserver_restart \ -fi +fi \ +%{nil} + +%define extension_scripts() \ +%post %1 \ +%ext_post \ +\ +%postun %1 \ +%ext_postun \ %{nil} # extension scripts defines @@ -2623,7 +2736,6 @@ fi %extension_scripts pdo-pgsql %extension_scripts pdo-sqlite %extension_scripts pgsql -%extension_scripts phar %extension_scripts pcntl %extension_scripts posix %extension_scripts pspell @@ -2651,28 +2763,46 @@ fi %extension_scripts zip %extension_scripts zlib +%post phar +%ext_post +%if %{with alternatives} +update-alternatives \ + --install %{_bindir}/phar phar %{_bindir}/phar%{ver_suffix}.phar %{ver_suffix} \ + --slave %{_mandir}/man1/phar.1 phar.1 %{_mandir}/man1/phar%{ver_suffix}.1* || : +%endif + +%postun phar +%ext_postun +%if %{with alternatives} +if [ $1 -eq 0 ]; then + update-alternatives --remove phar %{_bindir}/phar || : +fi +%endif + %if %{with apache1} -%files -n apache1-mod_php%{php_suffix} +%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 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache.ini -%attr(755,root,root) %{_libdir}/apache1/libphp5.so +%attr(755,root,root) %{_libdir}/apache1/mod_php.so +%attr(755,root,root) %{_libdir}/apache1/libphp5-*.*.so %endif %if %{with apache2} -%files -n apache-mod_php%{php_suffix} +%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 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache2handler.ini -%attr(755,root,root) %{_libdir}/apache/libphp5.so +%attr(755,root,root) %{_libdir}/apache/mod_php.so +%attr(755,root,root) %{_libdir}/apache/libphp5-*.*.so %endif %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} @@ -2694,13 +2824,13 @@ fi %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}/php%{ver_suffix} +%{_mandir}/man1/php%{ver_suffix}.1* %files program %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/php +%{_mandir}/man1/php.1* %if %{with fpm} %files fpm @@ -2708,10 +2838,13 @@ fi %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 +%if %{with alternatives} +%ghost %{_sbindir}/php-fpm +%endif +%{_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 @@ -2720,7 +2853,6 @@ fi %dir %{_sysconfdir} %dir %{_sysconfdir}/conf.d %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/browscap.ini %attr(755,root,root) %{_libdir}/libphp_common-*.so %dir %{php_extensiondir} @@ -2734,7 +2866,7 @@ fi %attr(755,root,root) %{_libdir}/libphp_common.so %{_libdir}/libphp_common.la %{_includedir}/php -%{_libdir}/php/build +%{_libdir}/%{name}/build %{_mandir}/man1/php-config.1* %{_mandir}/man1/phpize.1* %if %{with embed} @@ -2750,92 +2882,110 @@ fi %files bz2 %defattr(644,root,root,755) +%doc ext/bz2/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/bz2.ini %attr(755,root,root) %{php_extensiondir}/bz2.so %files calendar %defattr(644,root,root,755) +%doc ext/calendar/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/calendar.ini %attr(755,root,root) %{php_extensiondir}/calendar.so %files ctype %defattr(644,root,root,755) +%doc ext/calendar/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ctype.ini %attr(755,root,root) %{php_extensiondir}/ctype.so %if %{with curl} %files curl %defattr(644,root,root,755) +%doc ext/curl/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/curl.ini %attr(755,root,root) %{php_extensiondir}/curl.so %endif %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 dom %defattr(644,root,root,755) +%doc ext/dom/{CREDITS,TODO} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dom.ini %attr(755,root,root) %{php_extensiondir}/dom.so +%if %{with enchant} %files enchant %defattr(644,root,root,755) %doc ext/enchant/{CREDITS,docs/examples} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/enchant.ini %attr(755,root,root) %{php_extensiondir}/enchant.so +%endif %files exif %defattr(644,root,root,755) +%doc ext/exif/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/exif.ini %attr(755,root,root) %{php_extensiondir}/exif.so %files fileinfo %defattr(644,root,root,755) +%doc ext/fileinfo/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/fileinfo.ini %attr(755,root,root) %{php_extensiondir}/fileinfo.so %if %{with filter} %files filter %defattr(644,root,root,755) +%doc ext/filter/{CREDITS,docs/*} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/filter.ini %attr(755,root,root) %{php_extensiondir}/filter.so %endif %files ftp %defattr(644,root,root,755) +%doc ext/ftp/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ftp.ini %attr(755,root,root) %{php_extensiondir}/ftp.so %files gd %defattr(644,root,root,755) +%doc ext/gd/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gd.ini %attr(755,root,root) %{php_extensiondir}/gd.so %files gettext %defattr(644,root,root,755) +%doc ext/gettext/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gettext.ini %attr(755,root,root) %{php_extensiondir}/gettext.so %files gmp %defattr(644,root,root,755) +%doc ext/gmp/{CREDITS,README,TODO} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gmp.ini %attr(755,root,root) %{php_extensiondir}/gmp.so %files hash %defattr(644,root,root,755) +%doc ext/hash/{CREDITS,README} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/hash.ini %attr(755,root,root) %{php_extensiondir}/hash.so %files iconv %defattr(644,root,root,755) +%doc ext/iconv/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/iconv.ini %attr(755,root,root) %{php_extensiondir}/iconv.so %if %{with imap} %files imap %defattr(644,root,root,755) +%doc ext/imap/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/imap.ini %attr(755,root,root) %{php_extensiondir}/imap.so %endif @@ -2843,52 +2993,63 @@ fi %if %{with interbase} %files interbase %defattr(644,root,root,755) +%doc ext/interbase/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/interbase.ini %attr(755,root,root) %{php_extensiondir}/interbase.so %endif +%if %{with intl} %files intl %defattr(644,root,root,755) +%doc ext/intl/{CREDITS,TODO} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/intl.ini %attr(755,root,root) %{php_extensiondir}/intl.so +%endif %files json %defattr(644,root,root,755) +%doc ext/json/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/json.ini %attr(755,root,root) %{php_extensiondir}/json.so %if %{with ldap} %files ldap %defattr(644,root,root,755) +%doc ext/ldap/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/ldap.ini %attr(755,root,root) %{php_extensiondir}/ldap.so %endif %files mbstring %defattr(644,root,root,755) +%doc ext/mbstring/{CREDITS,README*} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mbstring.ini %attr(755,root,root) %{php_extensiondir}/mbstring.so %files mcrypt %defattr(644,root,root,755) +%doc ext/mcrypt/{CREDITS,TODO} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mcrypt.ini %attr(755,root,root) %{php_extensiondir}/mcrypt.so %if %{with mssql} %files mssql %defattr(644,root,root,755) +%doc ext/mssql/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mssql.ini %attr(755,root,root) %{php_extensiondir}/mssql.so %endif %files mysql %defattr(644,root,root,755) +%doc ext/mysql/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mysql.ini %attr(755,root,root) %{php_extensiondir}/mysql.so %if %{with mysqli} %files mysqli %defattr(644,root,root,755) +%doc ext/mysqli/{CREDITS,TODO} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mysqli.ini %attr(755,root,root) %{php_extensiondir}/mysqli.so %endif @@ -2896,13 +3057,15 @@ fi %if %{with mysqlnd} %files mysqlnd %defattr(644,root,root,755) +%doc ext/mysqlnd/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/MySQLND.ini %attr(755,root,root) %{php_extensiondir}/mysqlnd.so %endif -%if %{with oci8} +%if %{with oci} %files oci8 %defattr(644,root,root,755) +%doc ext/oci8/{CREDITS,README} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/oci8.ini %attr(755,root,root) %{php_extensiondir}/oci8.so %endif @@ -2910,6 +3073,7 @@ fi %if %{with odbc} %files odbc %defattr(644,root,root,755) +%doc ext/odbc/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/odbc.ini %attr(755,root,root) %{php_extensiondir}/odbc.so %endif @@ -2917,30 +3081,35 @@ fi %if %{with openssl} %files openssl %defattr(644,root,root,755) +%doc ext/openssl/{CREDITS,README} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/openssl.ini %attr(755,root,root) %{php_extensiondir}/openssl.so %endif %files pcntl %defattr(644,root,root,755) +%doc ext/pcntl/{CREDITS,README} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pcntl.ini %attr(755,root,root) %{php_extensiondir}/pcntl.so %if %{with pcre} %files pcre %defattr(644,root,root,755) +%doc ext/pcre/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/PCRE.ini %attr(755,root,root) %{php_extensiondir}/pcre.so %endif %files pdo %defattr(644,root,root,755) +%doc ext/pdo/{CREDITS,README,TODO} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo.ini %attr(755,root,root) %{php_extensiondir}/pdo.so %if %{with mssql} || %{with sybase_ct} %files pdo-dblib %defattr(644,root,root,755) +%doc ext/pdo_dblib/{CREDITS,README} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_dblib.ini %attr(755,root,root) %{php_extensiondir}/pdo_dblib.so %endif @@ -2948,18 +3117,21 @@ fi %if %{with interbase} && !%{with interbase_inst} %files pdo-firebird %defattr(644,root,root,755) +%doc ext/pdo_firebird/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_firebird.ini %attr(755,root,root) %{php_extensiondir}/pdo_firebird.so %endif %files pdo-mysql %defattr(644,root,root,755) +%doc ext/pdo_mysql/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_mysql.ini %attr(755,root,root) %{php_extensiondir}/pdo_mysql.so -%if %{with oci8} +%if %{with oci} %files pdo-oci %defattr(644,root,root,755) +%doc ext/pdo_oci/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_oci.ini %attr(755,root,root) %{php_extensiondir}/pdo_oci.so %endif @@ -2967,6 +3139,7 @@ fi %if %{with odbc} %files pdo-odbc %defattr(644,root,root,755) +%doc ext/pdo_odbc/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_odbc.ini %attr(755,root,root) %{php_extensiondir}/pdo_odbc.so %endif @@ -2974,6 +3147,7 @@ fi %if %{with pgsql} %files pdo-pgsql %defattr(644,root,root,755) +%doc ext/pdo_pgsql/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_pgsql.ini %attr(755,root,root) %{php_extensiondir}/pdo_pgsql.so %endif @@ -2981,6 +3155,7 @@ fi %if %{with pdo_sqlite} %files pdo-sqlite %defattr(644,root,root,755) +%doc ext/pdo_sqlite/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pdo_sqlite.ini %attr(755,root,root) %{php_extensiondir}/pdo_sqlite.so %endif @@ -2988,6 +3163,7 @@ fi %if %{with pgsql} %files pgsql %defattr(644,root,root,755) +%doc ext/pgsql/{CREDITS,README} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pgsql.ini %attr(755,root,root) %{php_extensiondir}/pgsql.so %endif @@ -2995,66 +3171,84 @@ fi %if %{with phar} %files phar %defattr(644,root,root,755) +%doc ext/phar/{CREDITS,TODO} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/phar.ini %attr(755,root,root) %{php_extensiondir}/phar.so +%attr(755,root,root) %{_bindir}/phar%{php_suffix}.phar +%{_mandir}/man1/phar%{php_suffix}.1* +%{_mandir}/man1/phar.phar.1* +%if %{with alternatives} +%ghost %{_bindir}/phar +%ghost %{_mandir}/man1/phar.1 +%else %attr(755,root,root) %{_bindir}/phar -%attr(755,root,root) %{_bindir}/phar.phar +%endif %endif %files posix %defattr(644,root,root,755) +%doc ext/posix/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/posix.ini %attr(755,root,root) %{php_extensiondir}/posix.so %if %{with pspell} %files pspell %defattr(644,root,root,755) +%doc ext/pspell/{CREDITS,README} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/pspell.ini %attr(755,root,root) %{php_extensiondir}/pspell.so %endif %files readline %defattr(644,root,root,755) +%doc ext/readline/{CREDITS,README*} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cli.d/readline.ini %attr(755,root,root) %{php_extensiondir}/readline.so %if %{with recode} %files recode %defattr(644,root,root,755) +%doc ext/recode/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/recode.ini %attr(755,root,root) %{php_extensiondir}/recode.so %endif %files session %defattr(644,root,root,755) +%doc ext/session/CREDITS %doc ext/session/mod_files.sh %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/Session.ini %attr(755,root,root) %{php_extensiondir}/session.so %files shmop %defattr(644,root,root,755) +%doc ext/shmop/{CREDITS,README} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/shmop.ini %attr(755,root,root) %{php_extensiondir}/shmop.so %files simplexml %defattr(644,root,root,755) +%doc ext/simplexml/{CREDITS,README} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/simplexml.ini %attr(755,root,root) %{php_extensiondir}/simplexml.so %if %{with snmp} %files snmp %defattr(644,root,root,755) +%doc ext/snmp/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/snmp.ini %attr(755,root,root) %{php_extensiondir}/snmp.so %endif %files soap %defattr(644,root,root,755) +%doc ext/soap/{CREDITS,TODO*} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/soap.ini %attr(755,root,root) %{php_extensiondir}/soap.so %files sockets %defattr(644,root,root,755) +%doc ext/sockets/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sockets.ini %attr(755,root,root) %{php_extensiondir}/sockets.so @@ -3075,22 +3269,26 @@ fi %if %{with sybase_ct} %files sybase-ct %defattr(644,root,root,755) +%doc ext/sybase_ct/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sybase_ct.ini %attr(755,root,root) %{php_extensiondir}/sybase_ct.so %endif %files sysvmsg %defattr(644,root,root,755) +%doc ext/sysvmsg/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sysvmsg.ini %attr(755,root,root) %{php_extensiondir}/sysvmsg.so %files sysvsem %defattr(644,root,root,755) +%doc ext/sysvsem/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sysvsem.ini %attr(755,root,root) %{php_extensiondir}/sysvsem.so %files sysvshm %defattr(644,root,root,755) +%doc ext/sysvshm/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/sysvshm.ini %attr(755,root,root) %{php_extensiondir}/sysvshm.so @@ -3112,55 +3310,65 @@ fi %if %{with tidy} %files tidy %defattr(644,root,root,755) +%doc ext/tidy/{CREDITS,README} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/tidy.ini %attr(755,root,root) %{php_extensiondir}/tidy.so %endif %files tokenizer %defattr(644,root,root,755) +%doc ext/tokenizer/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/tokenizer.ini %attr(755,root,root) %{php_extensiondir}/tokenizer.so %if %{with wddx} %files wddx %defattr(644,root,root,755) +%doc ext/wddx/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*wddx.ini %attr(755,root,root) %{php_extensiondir}/wddx.so %endif %files xml %defattr(644,root,root,755) +%doc ext/xml/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/xml.ini %attr(755,root,root) %{php_extensiondir}/xml.so %files xmlreader %defattr(644,root,root,755) +%doc ext/xmlreader/{CREDITS,README,TODO,examples} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/xmlreader.ini %attr(755,root,root) %{php_extensiondir}/xmlreader.so %if %{with xmlrpc} %files xmlrpc %defattr(644,root,root,755) +%doc ext/xmlrpc/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/xmlrpc.ini %attr(755,root,root) %{php_extensiondir}/xmlrpc.so %endif %files xmlwriter %defattr(644,root,root,755) +%doc ext/xmlwriter/{CREDITS,TODO} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/xmlwriter.ini %attr(755,root,root) %{php_extensiondir}/xmlwriter.so %files xsl %defattr(644,root,root,755) +%doc ext/xsl/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/xsl.ini %attr(755,root,root) %{php_extensiondir}/xsl.so %files zip %defattr(644,root,root,755) +%doc ext/zip/{CREDITS,TODO} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/zip.ini %attr(755,root,root) %{php_extensiondir}/zip.so %files zlib %defattr(644,root,root,755) +%doc ext/zlib/CREDITS %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/zlib.ini %attr(755,root,root) %{php_extensiondir}/zlib.so