From 3812f95c6f6decd7a3a7cabca74d1adbe4dcae19 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 9 Oct 2020 19:01:44 +0300 Subject: [PATCH] Update libdb-info.patch --- libdb-info.patch | 16 ++++++++-------- php.spec | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libdb-info.patch b/libdb-info.patch index ee25732..f2fcdfb 100644 --- a/libdb-info.patch +++ b/libdb-info.patch @@ -1,16 +1,16 @@ ---- php-7.0.0beta1/ext/dba/dba.c.libdb 2015-07-08 02:24:59.119020904 +0200 -+++ php-7.0.0beta1/ext/dba/dba.c 2015-07-08 07:01:43.158767655 +0200 -@@ -52,6 +52,10 @@ - #include "php_qdbm.h" - #include "php_tcadb.h" +--- php-8.0.0rc1/ext/dba/dba.c~ 2020-10-09 19:00:25.000000000 +0300 ++++ php-8.0.0rc1/ext/dba/dba.c 2020-10-09 19:01:14.638869747 +0300 +@@ -50,6 +50,10 @@ + #include "php_lmdb.h" + #include "dba_arginfo.h" +#ifdef DB4_INCLUDE_FILE +#include DB4_INCLUDE_FILE +#endif + - /* {{{ arginfo */ - ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2) - ZEND_ARG_INFO(0, path) + PHP_MINIT_FUNCTION(dba); + PHP_MSHUTDOWN_FUNCTION(dba); + PHP_MINFO_FUNCTION(dba); @@ -545,6 +549,10 @@ PHP_MINFO_FUNCTION(dba) php_info_print_table_start(); diff --git a/php.spec b/php.spec index 6c062e5..fccbf46 100644 --- a/php.spec +++ b/php.spec @@ -150,7 +150,7 @@ Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирова Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} Version: 8.0.0 -Release: 0.rc1.0 +Release: 0.rc1.1 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -1890,7 +1890,7 @@ cp -p php.ini-production php.ini %patch66 -p1 %patch67 -p1 -b .mysql-lib-ver-mismatch #%patch68 -p1 DROP or update to 7.0 APIs -#%patch71 -p1 -b .libdb-info +%patch71 -p1 -b .libdb-info sed -E -i -e '1s,#!\s*/usr/bin/env\s+(.*),#!%{__bindir}\1,' \ ext/ext_skel.php \ -- 2.44.0