X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php.spec;h=2d8d9423246d20a50173c7df1e49b5829e5be23c;hb=0282b86ee4b2cbb09c054d413718fb81a7f1df3a;hp=e31959cb72713598fb0b23b59b82cfd0e02c5756;hpb=6ef8f74a93c40fc96a6d4ce8f2aa38802f392521;p=packages%2Fphp.git diff --git a/php.spec b/php.spec index e31959c..2d8d942 100644 --- a/php.spec +++ b/php.spec @@ -2,13 +2,11 @@ # - 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 # - update imap annotations patch (needs api porting) # - update imap myrights patch (needs api porting) # --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. -# - 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 @@ -44,8 +42,8 @@ # 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_without instantclient # build Oracle oci8 extension module against oracle-instantclient package +%bcond_with system_gd # with system gd (imageantialias function is missing then) %bcond_with system_libzip # with system libzip (reported broken currently) %bcond_without default_php # use this PHP as default PHP in distro %bcond_without curl # without CURL extension module @@ -85,7 +83,7 @@ %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_without embed # disable Embedded API %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 @@ -139,13 +137,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.5.11 +Version: 5.5.12 Release: %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci} Epoch: 4 License: PHP Group: Libraries Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.xz -# Source0-md5: 1559ef6444d5020670ec52ea752501ee +# Source0-md5: 3fb091987063135fd86b3b5ba5010479 Source2: %{orgname}-mod_%{orgname}.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini @@ -172,10 +170,8 @@ Patch11: embed.patch Patch12: http://ilia.ws/patch/type_hint_53_v2.txt %endif Patch14: %{orgname}-no_pear_install.patch -#Patch15: %{orgname}-zlib.patch # no longer needed? Patch17: %{orgname}-readline.patch Patch18: %{orgname}-nohttpd.patch -Patch19: %{orgname}-gd_imagerotate_enable.patch Patch20: %{orgname}-uint32_t.patch Patch21: %{orgname}-dba-link.patch Patch22: %{orgname}-both-apxs.patch @@ -186,7 +182,6 @@ Patch26: %{orgname}-pear.patch Patch27: %{orgname}-config-dir.patch Patch29: %{orgname}-fcgi-graceful.patch Patch31: %{orgname}-fcgi-error_log-no-newlines.patch -#Patch32: %{orgname}-curl-limit-speed.patch # applied upstream Patch34: %{orgname}-libtool.patch Patch35: %{orgname}-tds.patch Patch36: %{orgname}-mysql-charsetphpini.patch @@ -200,20 +195,15 @@ Patch44: %{orgname}-include_path.patch Patch45: %{orgname}-imap-annotations.patch Patch46: %{orgname}-imap-myrights.patch Patch47: suhosin.patch -#Patch49: %{orgname}-m4-divert.patch # no longer needed, upstream supports new ac Patch50: extension-shared-optional-dep.patch Patch51: spl-shared.patch Patch52: pcre-shared.patch Patch53: fix-test-run.patch -#Patch54: mysqlnd-shared.patch # shared build supported upstream Patch55: bug-52078-fileinode.patch -#Patch57: bug-52448.patch # outdated Patch59: %{orgname}-systzdata.patch Patch60: %{orgname}-oracle-instantclient.patch -#Patch61: %{orgname}-krb5-ac.patch # not needed on 5.4 anymore Patch62: mcrypt-libs.patch Patch63: %{orgname}-mysql-nowarning.patch -#Patch64: %{orgname}-m4.patch # not needed on 5.4 branch Patch65: system-libzip.patch Patch66: php-db.patch Patch67: mysql-lib-ver-mismatch.patch @@ -231,7 +221,6 @@ BuildRequires: cyrus-sasl-devel BuildRequires: db-devel >= 4.0 BuildRequires: elfutils-devel %{?with_enchant:BuildRequires: enchant-devel >= 1.1.3} -#BuildRequires: fcgi-devel %{?with_kerberos5:BuildRequires: heimdal-devel} %{?with_system_libzip:BuildRequires: libzip-devel >= 0.10.1-2} %{!?with_mysqlnd:BuildRequires: mysql-devel} @@ -252,7 +241,6 @@ BuildRequires: libjpeg-devel BuildRequires: libltdl-devel >= 1.4 BuildRequires: libmcrypt-devel >= 2.4.4 BuildRequires: libpng-devel >= 1.0.8 -#BuildRequires: libtiff-devel %{?with_webp:BuildRequires: libvpx-devel} BuildRequires: tokyocabinet-devel %if "%{pld_release}" != "ac" @@ -260,7 +248,6 @@ BuildRequires: libtool >= 2:2.2 %else BuildRequires: libtool >= 1.4.3 %endif -#BuildRequires: libwrap-devel BuildRequires: libxml2-devel >= 1:2.7.6-4 BuildRequires: libxslt-devel >= 1.1.0 %{?with_mm:BuildRequires: mm-devel >= 1.3.0} @@ -271,7 +258,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_oci8:%{?with_instantclient:BuildRequires: oracle-instantclient-devel}} BuildRequires: pam-devel %{?with_pcre:BuildRequires: pcre-devel >= 8.10} BuildRequires: pkgconfig @@ -300,9 +287,6 @@ BuildRequires: apache-devel >= 2.0.52-2 BuildRequires: apr-devel >= 1:1.0.0 BuildRequires: apr-util-devel >= 1:1.0.0 %endif -%if %{with fpm} -#BuildRequires: judy-devel -%endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define php_sysconfdir /etc/%{name} @@ -856,9 +840,8 @@ Group: Libraries URL: http://www.php.net/manual/en/book.image.php Requires: %{name}-common = %{epoch}:%{version}-%{release} %if %{with system_gd} -Requires: gd >= 2.0.28-4 +Requires: gd >= 2.1 Requires: gd(gif) -Requires: gd(imagerotate) = 5.2.0 %endif Provides: php(gd) @@ -1196,6 +1179,7 @@ Um módulo para aplicações PHP que usam ODBC. %package opcache Summary: Zend Optimizer+ - PHP code optimizer +Summary(pl.UTF-8): Zend Optimizer+ - optymalizator kodu PHP Group: Libraries URL: https://wiki.php.net/rfc/optimizerplus Requires: %{name}-common = %{epoch}:%{version}-%{release} @@ -1209,6 +1193,14 @@ 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. +%description opcache -l pl.UTF-8 +Zend OPcache zapewnia szybsze wykonywanie kodu PHP dzięki buforowaniu +i optymalizacji na poziomie opcode'ów. Poprawia wydajność PHP +przechowując prekompilowany bajtkod skryptu w pamięci współdzielonej. +Eliminuje etapy odczytu kodu z dysku i kompilacji przy późniejszym +dostępie. Ponadto wykonuje kilka wzorców optymalizacji bajtkodu, +czyniąc wykonywanie kodu szybszym. + %package openssl Summary: OpenSSL extension module for PHP Summary(pl.UTF-8): Moduł OpenSSL dla PHP @@ -1850,8 +1842,8 @@ URL: http://www.php.net/manual/en/book.xsl.php Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: %{name}-dom = %{epoch}:%{version}-%{release} Requires: libxslt >= 1.0.18 -# actually not true, functionality is similar, but API differs Provides: php(xsl) +# actually not true, functionality is similar, but API differs Obsoletes: php-xslt <= 3:4.3.8-1 %description xsl @@ -1912,9 +1904,6 @@ cp -p php.ini-production php.ini %patch14 -p1 %patch17 -p1 %patch18 -p1 -%if %{with system_gd} -%patch19 -p1 -%endif %patch20 -p1 %patch21 -p1 %patch22 -p1 @@ -2168,21 +2157,21 @@ for sapi in $sapis; do sapi_args='--disable-cgi %{?with_gcov:--enable-gcov}' ;; fpm) - sapi_args='--disable-cli --enable-fpm' + sapi_args='--disable-cli --disable-cgi --enable-fpm' ;; embed) - sapi_args='--disable-cli --enable-embed' + sapi_args='--disable-cli --disable-cgi --enable-embed' ;; apxs1) ver=$(rpm -q --qf '%{V}' apache1-devel) - sapi_args="--disable-cli --with-apxs=%{apxs1} --with-apache-version=$ver" + sapi_args="--disable-cli --disable-cgi --with-apxs=%{apxs1} --with-apache-version=$ver" ;; apxs2) ver=$(rpm -q --qf '%{V}' apache-devel) - sapi_args="--disable-cli --with-apxs2=%{apxs2} --with-apache-version=$ver" + sapi_args="--disable-cli --disable-cgi --with-apxs2=%{apxs2} --with-apache-version=$ver" ;; litespeed) - sapi_args='--with-litespeed' + sapi_args='--disable-cli --disable-cgi --with-litespeed ' ;; esac @@ -2323,7 +2312,11 @@ cp -af Makefile.cli Makefile %endif %if %{with litespeed} -%{__make} -f Makefile.litespeed +%{__make} -f Makefile.litespeed litespeed +%endif + +%if %{with embed} +%{__make} -f Makefile.embed libphp5.la %endif # CGI/FCGI @@ -2494,9 +2487,10 @@ cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm # install Embedded API %if %{with embed} -%{__make} -f Makefile.embed install-sapi INSTALL_ROOT=$RPM_BUILD_ROOT # we could use install-headers from Makefile.embed, but that would reinstall all headers +# install-sapi installs to wrong dir, so just do it all manually install -d $RPM_BUILD_ROOT%{_includedir}/php/sapi/embed +install -p libs/libphp5.so $RPM_BUILD_ROOT%{_libdir} cp -p sapi/embed/php_embed.h $RPM_BUILD_ROOT%{_includedir}/php/sapi/embed %endif @@ -2565,10 +2559,6 @@ cp -a tests/* $RPM_BUILD_ROOT%{php_data_dir}/tests/php # fix install paths, avoid evil rpaths sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" $RPM_BUILD_ROOT%{_libdir}/libphp_common.la -%if %{with embed} -# libphp5.la contains our buildroot in dependency_libs -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}/%{name}/build/acinclude.m4 @@ -2762,7 +2752,7 @@ fi %if %{with embed} %files embedded %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libphp5-%{version}.so +%attr(755,root,root) %{_libdir}/libphp5.so %endif %files cli @@ -2813,11 +2803,6 @@ fi %{_libdir}/%{name}/build %{_mandir}/man1/php-config.1* %{_mandir}/man1/phpize.1* -%if %{with embed} -# embedded -%{_libdir}/libphp5.so -%{_libdir}/libphp5.la -%endif %files bcmath %defattr(644,root,root,755)