X-Git-Url: https://git.tld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=php.spec;h=12c5ef9a9f22a59c35522782bef8ff000bd04d0b;hp=5c09bbde710d615fd01ac38c733a47f5c7b85068;hb=fc50e4061f8dc8a9a4cbcfa7deec2a3f33a723ad;hpb=d0ec43b6353de05448369133e129767f2bb07cab diff --git a/php.spec b/php.spec index 5c09bbd..12c5ef9 100644 --- a/php.spec +++ b/php.spec @@ -142,8 +142,8 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} -Version: 7.1.1 -Release: 0.1 +Version: 7.1.11 +Release: 1 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -151,7 +151,7 @@ Epoch: 4 License: PHP 3.01 and Zend and BSD Group: Libraries Source0: http://php.net/distributions/%{orgname}-%{version}.tar.xz -# Source0-md5: 65eef256f6e7104a05361939f5e23ada +# Source0-md5: bbf4dfe4f501143a1763eb86b6a0a454 Source2: %{orgname}-mod_php.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini @@ -199,7 +199,6 @@ Patch52: pcre-shared.patch Patch53: fix-test-run.patch Patch55: bug-52078-fileinode.patch Patch59: %{orgname}-systzdata.patch -Patch60: %{orgname}-oracle-instantclient.patch Patch62: mcrypt-libs.patch Patch65: system-libzip.patch Patch66: php-db.patch @@ -1966,7 +1965,6 @@ cp -p php.ini-production php.ini %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt %patch55 -p1 %patch59 -p1 -%patch60 -p1 %patch62 -p1 %{?with_system_libzip:%patch65 -p1} %patch66 -p1 @@ -2114,8 +2112,8 @@ 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 +ver=$(awk '/#define PHP_SQLITE3_VERSION/ {print $3}' ext/sqlite3/php_sqlite3.h | xargs) +if test "$ver" != "PHP_VERSION"; then : Error: Upstream Sqlite3 version is now ${ver}, expecting %{sqlite3ver}. : Update the sqlite3ver macro and rebuild. exit 1