X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php.spec;h=0c5135cbd5f608d8b9d88f097981a04a2d38f480;hb=04731d5ebff001c685b359cd3ad37add92183e58;hp=aed0d0185026bebb65f5938656be98485a840f49;hpb=6bbac1e61a832a103095b27febd111632d4a3bda;p=packages%2Fphp.git diff --git a/php.spec b/php.spec index aed0d01..0c5135c 100644 --- a/php.spec +++ b/php.spec @@ -119,7 +119,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %endif %endif -%define rel 1 +%define rel 3 %define orgname php %define ver_suffix 53 %define php_suffix %{!?with_default_php:%{ver_suffix}} @@ -130,13 +130,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.26 +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: d71db8d92edbb48beb5b645b55471139 +# Source0-md5: 25ae23a5b9615fe8d33de5b63e1bb788 Source2: %{orgname}-mod_%{orgname}.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini @@ -193,6 +193,7 @@ Patch44: %{orgname}-include_path.patch Patch45: %{orgname}-imap-annotations.patch Patch46: %{orgname}-imap-myrights.patch Patch47: suhosin.patch +Patch48: php-bug-60598.patch Patch49: %{orgname}-m4-divert.patch Patch50: extension-shared-optional-dep.patch Patch51: spl-shared.patch @@ -310,6 +311,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} @@ -1623,7 +1625,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 @@ -1949,6 +1951,7 @@ cp -p php.ini-production php.ini %if %{with suhosin} %patch47 -p1 %endif +%patch48 -p1 %patch49 -p1 %patch50 -p1 %patch51 -p1 @@ -2043,6 +2046,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}. @@ -2828,6 +2837,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