From 6c4103d44dd1ad45f22f1f25e7f8072f21bea91b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 3 Nov 2021 08:09:03 +0100
Subject: update to 8.0.13RC1

dba: enable qdbm backend
dba: drop gdbm backend
---
 php80.spec | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

(limited to 'php80.spec')

diff --git a/php80.spec b/php80.spec
index 1b8bfa7..457f3f6 100644
--- a/php80.spec
+++ b/php80.spec
@@ -14,7 +14,7 @@
 # Extension version
 %global fileinfover 1.0.5
 %global oci8ver     3.0.1
-%global zipver      1.19.4
+%global zipver      1.19.5
 
 # Adds -z now to the linker flags
 %global _hardened_build 1
@@ -48,6 +48,13 @@
 %bcond_with           libpcre
 %endif
 
+# Using qdbm from "remi" for now, see https://bugzilla.redhat.com/2017308
+%if 0%{?fedora} >= 33 || 0%{?rhel} >= 8
+%bcond_without        qdbm
+%else
+%bcond_with           qdbm
+%endif
+
 # TODO change when 8.5 released (libxcrypt 4.1.1-6)
 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
 # switch to bundled library using --without libxcrypt
@@ -94,13 +101,13 @@
 %bcond_without         libgd
 %bcond_with            zip
 
-%global upver          8.0.12
-#global rcver          RC1
+%global upver          8.0.13
+%global rcver          RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 2%{?dist}
+Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -165,7 +172,7 @@ Patch49: php-8.0.10-phar-sha.patch
 # compatibility with OpenSSL 3.0, from 8.1
 Patch50: php-8.0.10-openssl3.patch
 # use system libxcrypt, from 8.1
-Patch51: php-8.0.12-crypt.patch
+Patch51: php-8.0.13-crypt.patch
 
 # RC Patch
 Patch91: php-7.2.0-oci8conf.patch
@@ -919,8 +926,10 @@ Summary: A database abstraction layer module for PHP applications
 License: PHP
 BuildRequires: libdb-devel
 BuildRequires: tokyocabinet-devel
-BuildRequires: gdbm-devel
 BuildRequires: lmdb-devel
+%if %{with qdbm}
+BuildRequires: qdbm-devel
+%endif
 Requires: php-common%{?_isa} = %{version}-%{release}
 %if 0%{?rhel}
 Obsoletes: php53-dba, php53u-dba, php54-dba, php54w-dba, php55u-dba, php55w-dba, php56u-dba, php56w-dba
@@ -1445,9 +1454,11 @@ build --libdir=%{_libdir}/php \
       --with-bz2=shared \
       --enable-ctype=shared \
       --enable-dba=shared --with-db4=%{_prefix} \
-                          --with-gdbm=%{_prefix} \
                           --with-tcadb=%{_prefix} \
                           --with-lmdb=%{_prefix} \
+%if %{with qdbm}
+                          --with-qdbm=%{_root_prefix} \
+%endif
       --enable-exif=shared \
       --enable-ftp=shared \
       --with-gettext=shared \
@@ -1583,9 +1594,11 @@ build --includedir=%{_includedir}/php-zts \
       --with-bz2=shared \
       --enable-ctype=shared \
       --enable-dba=shared --with-db4=%{_prefix} \
-                          --with-gdbm=%{_prefix} \
                           --with-tcadb=%{_prefix} \
                           --with-lmdb=%{_prefix} \
+%if %{with qdbm}
+                          --with-qdbm=%{_root_prefix} \
+%endif
       --with-gettext=shared \
       --with-iconv=shared \
       --enable-sockets=shared \
@@ -2175,6 +2188,11 @@ fi
 
 
 %changelog
+* Wed Nov  3 2021 Remi Collet <remi@remirepo.net> - 8.0.13~RC1-1
+- update to 8.0.13RC1
+- dba: enable qdbm backend
+- dba: drop gdbm backend
+
 * Tue Oct 26 2021 Remi Collet <remi@remirepo.net> - 8.0.12-2
 - add patch for OpenSSL 3.0 on F36 and EL9
 
-- 
cgit