X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php.spec;h=dadf2d824915c1fe85332bb578e5a04f4bace8ea;hb=0462ff5f30fcb7f5ac2a199114e810041d9f643b;hp=822ce9e4987388dededff36bdf19be35be65ea1a;hpb=6a22c3727fc1ea6711d53f7efb50efddf11a60f2;p=packages%2Fphp.git diff --git a/php.spec b/php.spec index 822ce9e..dadf2d8 100644 --- a/php.spec +++ b/php.spec @@ -25,8 +25,9 @@ #+ereg # libxml # Reflection -# +# # Conditional build: +%bcond_with default_php # use this PHP as default PHP in distro %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 @@ -110,10 +111,10 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %undefine with_filter %endif -%define orgname php -%define php_suffix 53 - %define rel 2 +%define orgname php +%define ver_suffix 53 +%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 @@ -121,13 +122,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.3.24 +Version: 5.3.27 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: 9820604df98c648297dcd31ffb8214e8 +# Source0-md5: 25ae23a5b9615fe8d33de5b63e1bb788 Source2: %{orgname}-mod_%{orgname}.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini @@ -142,7 +143,7 @@ Source14: skip-tests.sh Source15: http://litespeedtech.com/packages/lsapi/%{orgname}-litespeed-%{litespeed_version}.tgz # Source15-md5: 69cf9c68d37b5b0b041889294ab305fe Patch0: %{orgname}-shared.patch -Patch1: %{orgname}-pldlogo.patch +Patch1: %{orgname}-tld.patch Patch2: %{orgname}-mail.patch Patch3: %{orgname}-link-libs.patch Patch4: %{orgname}-libpq_fs_h_path.patch @@ -197,6 +198,7 @@ Patch64: %{orgname}-m4.patch # http://spot.fedorapeople.org/php-5.3.6-libzip.patch Patch65: system-libzip.patch Patch66: %{orgname}-db.patch +Patch67: php-litespeed.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} @@ -296,6 +298,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define jsonver 1.2.1 %define pharver 2.0.1 %define sqlitever 2.0-dev +%define sqlite3ver 0.7-dev %define zipver 1.11.0 %define zend_zts %{!?with_zts:0}%{?with_zts:1} @@ -433,6 +436,7 @@ Summary: PHP as CLI interpreter Summary(pl.UTF-8): PHP jako interpreter działający z linii poleceń Group: Development/Languages/PHP Requires: %{name}-common = %{epoch}:%{version}-%{release} +Obsoletes: php-program %description cli PHP as CLI interpreter. @@ -454,19 +458,6 @@ applications to provide PHP scripting language support. Ten pakiet zawiera bibliotekę, którą można osadzać w aplikacjach w celu obsługi PHP jako języka skryptowego. -%package program -Summary: /usr/bin/php symlink -Summary(pl.UTF-8): Dowiązanie symboliczne /usr/bin/php -Group: Development/Languages/PHP -Requires: %{name}-cli = %{epoch}:%{version}-%{release} -Obsoletes: /usr/bin/php - -%description program -Package providing /usr/bin/php symlink to PHP CLI. - -%description program -l pl.UTF-8 -Pakiet dostarczający dowiązanie symboliczne /usr/bin/php do PHP CLI. - %package fpm Summary: PHP FastCGI Process Manager Summary(pl.UTF-8): PHP FastCGI Process Manager - zarządca procesów FastCGI @@ -1598,7 +1589,7 @@ Summary(pl.UTF-8): Moduł SQLite3 dla PHP Group: Libraries URL: http://php.net/manual/en/book.sqlite3.php Requires: %{name}-common = %{epoch}:%{version}-%{release} -Provides: php(sqlite3) +Provides: php(sqlite3) = %{sqlite3ver} %description sqlite3 SQLite is a C library that implements an embeddable SQL database @@ -1937,6 +1928,7 @@ cp -p php.ini-production php.ini %patch66 -p1 %{__rm} -r sapi/litespeed gzip -dc %{SOURCE15} | tar xf - -C sapi/ +%patch67 -p1 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4 @@ -2015,6 +2007,12 @@ if test "$ver" != "%{pharver}"; then : Update the pharver macro and rebuild. exit 1 fi +ver=$(sed -n '/#define PHP_SQLITE3_VERSION/{s/.* "//;s/".*$//;p}' ext/sqlite3/php_sqlite3.h) +if test "$ver" != "%{sqlite3ver}"; then + : Error: Upstream Sqlite3 version is now ${ver}, expecting %{sqlite3ver}. + : Update the sqlite3ver macro and rebuild. + exit 1 +fi ver=$(sed -n '/#define PHP_ZIP_VERSION_STRING /{s/.* "//;s/".*$//;p}' ext/zip/php_zip.h) if test "$ver" != "%{zipver}"; then : Error: Upstream ZIP version is now ${ver}, expecting %{zipver}. @@ -2376,18 +2374,21 @@ 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{,-%{version}}.so -ln -s libphp5-%{version}.so $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5.so +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{,-%{version}}.so -ln -s libphp5-%{version}.so $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.so +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 @@ -2433,16 +2434,18 @@ cp -p sapi/embed/php_embed.h $RPM_BUILD_ROOT%{_includedir}/php/sapi/embed %endif # install CLI -# without suffix, install as php.cli -%if "%{?php_suffix}" == "" -%define phpfn %{name}.cli -%else -%define phpfn %{name} +# 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 + +%if %{with default_php} +# man for php +echo ".so php%{ver_suffix}.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.1 +# link as /usr/bin/php +ln -sf php%{ver_suffix} $RPM_BUILD_ROOT%{_bindir}/php +# php.cli link for backward compatibility +ln -sf php $RPM_BUILD_ROOT%{_bindir}/php.cli %endif -libtool --mode=install install -p sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/%{phpfn} -cp -p sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{phpfn}.1 -echo ".so %{phpfn}.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.1 -ln -sf %{phpfn} $RPM_BUILD_ROOT%{_bindir}/php cp -p php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini @@ -2662,7 +2665,7 @@ fi %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-%{version}.so +%attr(755,root,root) %{_libdir}/apache1/libphp5-*.*.so %endif %if %{with apache2} @@ -2672,7 +2675,7 @@ fi %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-%{version}.so +%attr(755,root,root) %{_libdir}/apache/libphp5-*.*.so %endif %if %{with litespeed} @@ -2700,13 +2703,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}/%{phpfn} -%{_mandir}/man1/%{phpfn}.1* - -%files program -%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/php%{ver_suffix} +%{_mandir}/man1/php%{ver_suffix}.1* +%if %{with default_php} %attr(755,root,root) %{_bindir}/php +%attr(755,root,root) %{_bindir}/php.cli %{_mandir}/man1/php.1* +%endif %if %{with fpm} %files fpm @@ -2784,6 +2787,7 @@ fi %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