X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php.spec;h=b59370d11e3892080b85e88726c4eac8a445d42e;hb=580d93e0492ab76a093ebd0d417c6db422341478;hp=9023d6568883265fefa740764a862beeee5bbeb1;hpb=ce9aa3afa815896094925ca6a80c3fbc1597a7ba;p=packages%2Fphp.git diff --git a/php.spec b/php.spec index 9023d65..b59370d 100644 --- a/php.spec +++ b/php.spec @@ -1,19 +1,22 @@ +# TODO 5.5: +# - enable --with-fpm-systemd, but ensure it checks for sd_booted() +# - build with system libgd 2.1, see 73c5128 # 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? # 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 @@ -44,13 +47,15 @@ %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) +%bcond_with default_php # use this PHP as default PHP in distro %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 intl # without Intl extension module %bcond_without kerberos5 # without Kerberos5 support -%bcond_with litespeed # build litespeed module +%bcond_without litespeed # build litespeed 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 @@ -59,6 +64,7 @@ %bcond_with mysqlnd # with mysqlnd support in mysql related extensions %bcond_without mysqli # without mysqli support (Requires mysql > 4.1) %bcond_without odbc # without ODBC extension module +%bcond_without opcache # without Enable Zend OPcache extension support %bcond_without openssl # without OpenSSL support and OpenSSL extension (module) %bcond_without pcre # without PCRE extension module %bcond_without pdo_sqlite # without PDO SQLite extension module @@ -71,6 +77,7 @@ %bcond_without sqlite3 # without SQLite3 extension module %bcond_without sybase_ct # without Sybase-CT extension module %bcond_without tidy # without Tidy extension module +%bcond_without webp # Without WebP support in GD extension (imagecreatefromwebp) %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 @@ -79,14 +86,13 @@ %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_without 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 %define apxs1 /usr/sbin/apxs1 %define apxs2 /usr/sbin/apxs -%define litespeed_version 5.5 # disable all sapis %if %{with gcov} @@ -122,10 +128,10 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %undefine with_filter %endif +%define rel 0.4 %define orgname php -%define php_suffix 54 - -%define rel 0.1 +%define ver_suffix 55 +%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 @@ -133,13 +139,13 @@ 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.5.0 Release: %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci} Epoch: 4 License: PHP Group: Libraries Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2 -# Source0-md5: ffcc7f4dcf2b79d667fe0c110e6cb724 +# Source0-md5: daf2d54e79def9fd0fb2ac7dfcefb7f3 Source2: %{orgname}-mod_%{orgname}.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini @@ -151,9 +157,6 @@ 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 @@ -212,8 +215,8 @@ 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 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} @@ -227,10 +230,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} @@ -238,19 +240,18 @@ BuildRequires: freetds-devel >= 0.82 %endif BuildRequires: freetype-devel >= 2.0 %if %{with system_gd} -BuildRequires: gd-devel >= 2.0.28-4 -BuildRequires: gd-devel(imagerotate) = 5.2.0 +BuildRequires: gd-devel >= 2.1 %endif BuildRequires: gdbm-devel BuildRequires: gmp-devel %{?with_imap:BuildRequires: imap-devel >= 1:2007e-2} -BuildRequires: libicu-devel +%{?with_intl:BuildRequires: libicu-devel >= 4.4} 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 @@ -279,6 +280,8 @@ BuildRequires: readline-devel BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpm-build >= 4.4.0 BuildRequires: rpmbuild(macros) >= 1.566 +BuildRequires: tar >= 1:1.22 +BuildRequires: xz %if %{with sqlite3} || %{with pdo_sqlite} BuildRequires: sqlite3-devel >= 3.3.9 %endif @@ -297,28 +300,28 @@ 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) -%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 -%define php_api_version 20100412 -%define zend_module_api 20100525 -%define zend_extension_api 220100525 +%define php_api_version 20121113 +%define zend_module_api 20121212 +%define zend_extension_api 220121212 # Extension versions %define bz2ver 1.0 %define enchantver 1.1.0 -%define fileinfover 1.0.5 +%define fileinfover 1.0.5-dev %define hashver 1.0 %define intlver 1.1.0 %define jsonver 1.2.1 +%define opcachever 7.0.2-dev %define pharver 2.0.1 -%define sqlite3ver 0.7 +%define sqlite3ver 0.7-dev %define zipver 1.11.0 %define zend_zts %{!?with_zts:0}%{?with_zts:1} @@ -386,7 +389,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 @@ -398,13 +401,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 @@ -414,10 +417,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 @@ -441,8 +444,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. @@ -473,7 +479,7 @@ 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 +Ten pakiet zawiera bibliotekę, którą można osadzać w aplikacjach w celu obsługi PHP jako języka skryptowego. %package program @@ -499,7 +505,6 @@ 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 Requires: rc-scripts Provides: user(http) Provides: webserver(php) = %{version} @@ -519,24 +524,26 @@ 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} Obsoletes: php-pecl-domxml @@ -574,8 +581,10 @@ Requires: libtool %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. @@ -714,8 +723,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 @@ -1179,6 +1188,21 @@ Moduł PHP ze wsparciem dla ODBC. %description odbc -l pt_BR.UTF-8 Um módulo para aplicações PHP que usam ODBC. +%package opcache +Summary: Zend Optimizer+ - PHP code optimizer +Group: Libraries +URL: https://wiki.php.net/rfc/optimizerplus +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Provides: php(opcache) = %{opcachever} + +%description opcache +The Zend OPcache provides faster PHP execution through opcode caching +and optimization. It improves PHP performance by storing precompiled +script bytecode in the shared memory. This eliminates the stages of +reading code from the disk and compiling it on future access. In +addition, it applies a few bytecode optimization patterns that make +code execution faster. + %package openssl Summary: OpenSSL extension module for PHP Summary(pl.UTF-8): Moduł OpenSSL dla PHP @@ -1395,11 +1419,12 @@ Group: Libraries URL: http://www.php.net/manual/en/book.phar.php Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: %{name}-spl = %{epoch}:%{version}-%{release} +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 @@ -1835,7 +1860,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} @@ -1863,8 +1888,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 @@ -1926,8 +1949,7 @@ 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 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4 @@ -1963,6 +1985,21 @@ sed -i -e 's#-fvisibility=hidden##g' configure* # says just "Terminated" twice and fails 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 @@ -1971,7 +2008,24 @@ 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 + sh -xe %{_sourcedir}/skip-tests.sh %build API=$(awk '/#define PHP_API_VERSION/{print $3}' main/php.h) @@ -2023,6 +2077,12 @@ if test "$ver" != "%{jsonver}"; then : Update the jsonver macro and rebuild. exit 1 fi +ver=$(sed -n '/#define ACCELERATOR_VERSION /{s/.* "//;s/".*$//;p}' ext/opcache/ZendAccelerator.h) +if test "$ver" != "%{opcachever}"; then + : Error: Upstream Zend Opcachge version is now ${ver}, expecting %{opcachever}. + : Update the opcachever macro and rebuild. + exit 1 +fi ver=$(sed -rne 's,.*(.+),\1,p' ext/bz2/package.xml) if test "$ver" != "%{bz2ver}"; then : Error: Upstream BZIP2 version is now ${ver}, expecting %{bz2ver}. @@ -2137,7 +2197,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 \ @@ -2158,12 +2218,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-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_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 \ @@ -2196,10 +2256,11 @@ 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_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_opcache:--enable-opcache=shared} \ %{?with_openssl:--with-openssl=shared} \ %{?with_kerberos5:--with-kerberos} \ --with-tcadb=/usr \ @@ -2234,8 +2295,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 @@ -2259,20 +2320,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"]));' @@ -2283,6 +2344,9 @@ install -d conf.d generate_inifiles() { for so in modules/*.so; do mod=$(basename $so .so) + ext=extension + # opcache.so is zend extension + nm $so | grep -q zend_extension_entry && ext=zend_extension conf="$mod.ini" # xml needs to be loaded before wddx [ "$mod" = "wddx" ] && conf="xml_$mod.ini" @@ -2296,8 +2360,8 @@ generate_inifiles() { [ "$mod" = "mysqlnd" ] && conf="MySQLND.ini" echo "+ $conf" cat > conf.d/$conf <<-EOF - ; Enable $mod extension module - extension=$mod.so + ; Enable $mod $ext module + $ext=$mod.so EOF done } @@ -2319,11 +2383,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 @@ -2334,17 +2393,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 @@ -2362,19 +2427,26 @@ cp -pf Makefile.cli Makefile # make link relative ln -sfn phar.phar $RPM_BUILD_ROOT%{_bindir}/phar +# 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/libphp5.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/libphp5.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} @@ -2382,21 +2454,30 @@ 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 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 + +%{__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 @@ -2408,12 +2489,13 @@ 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 +# 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 -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 @@ -2430,6 +2512,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 @@ -2473,22 +2562,22 @@ sed -i -e 's|libphp_common.la|$(libdir)/libphp_common.la|' $RPM_BUILD_ROOT%{_lib %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 @@ -2497,13 +2586,13 @@ 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 @@ -2538,24 +2627,6 @@ 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 -fi -%endif - # common macros called at extension post/postun scriptlet %define extension_scripts() \ %post %1 \ @@ -2600,6 +2671,7 @@ fi %extension_scripts mysqlnd %extension_scripts oci8 %extension_scripts odbc +%extension_scripts opcache %extension_scripts openssl %extension_scripts pcre %extension_scripts pdo @@ -2640,27 +2712,29 @@ fi %extension_scripts zlib %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/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/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} @@ -2668,8 +2742,8 @@ fi %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} @@ -2682,13 +2756,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 @@ -2696,10 +2770,10 @@ 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 +%{_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 @@ -2738,92 +2812,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 @@ -2831,52 +2923,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 @@ -2884,6 +2987,7 @@ 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 @@ -2891,6 +2995,7 @@ fi %if %{with oci8} %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 @@ -2898,37 +3003,51 @@ 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 +%if %{with opcache} +%files opcache +%defattr(644,root,root,755) +%doc ext/opcache/README +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/opcache.ini +%attr(755,root,root) %{php_extensiondir}/opcache.so +%endif + %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 @@ -2936,18 +3055,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} %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 @@ -2955,6 +3077,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 @@ -2962,6 +3085,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 @@ -2969,6 +3093,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 @@ -2976,6 +3101,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 @@ -2983,6 +3109,7 @@ 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 @@ -2991,58 +3118,68 @@ fi %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 @@ -3063,22 +3200,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 @@ -3100,55 +3241,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