From f2e77f6d03bd1ec742c04778e437a6d7cb7f1026 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Dec 2021 12:49:55 +0100 Subject: update to 8.1.1RC1 use oracle client library version 21.4 ensure libgd 2.3 is used --- failed.txt | 2 +- php.spec | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/failed.txt b/failed.txt index 2d16e87..08d3c2f 100644 --- a/failed.txt +++ b/failed.txt @@ -1,4 +1,4 @@ -===== 8.1.0 (2021-11-25) +===== 8.1.1RC1 (2021-12-02) $ grep -ar 'Tests failed' /var/lib/mock/*/build.log diff --git a/php.spec b/php.spec index 6da8c3a..4d63e5c 100644 --- a/php.spec +++ b/php.spec @@ -49,7 +49,7 @@ %global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock) -%global oraclever 21.3 +%global oraclever 21.4 %global oraclelib 21.1 # Build for LiteSpeed Web Server (LSAPI), you can disable using --without tests @@ -126,9 +126,9 @@ #global gh_date 20210809 %global gh_owner php %global gh_project php-src -%global upver 8.1.0 -#global rcver RC6 -#global lower rc6 +%global upver 8.1.1 +%global rcver RC1 +%global lower RC1 Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php @@ -718,12 +718,7 @@ License: PHP and BSD %endif Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} %if %{with libgd} -BuildRequires: pkgconfig(gdlib) >= 2.1.1 -%if 0%{?fedora} <= 19 && 0%{?rhel} <= 7 -Requires: gd-last%{?_isa} >= 2.1.1 -%else -Requires: gd%{?_isa} >= 2.1.1 -%endif +BuildRequires: pkgconfig(gdlib) >= 2.3 %else # Required to build the bundled GD library BuildRequires: pkgconfig(zlib) @@ -1850,6 +1845,11 @@ fi %changelog +* Thu Dec 2 2021 Remi Collet - 8.1.1~RC1-1 +- update to 8.1.1RC1 +- use oracle client library version 21.4 +- ensure libgd 2.3 is used + * Wed Nov 24 2021 Remi Collet - 8.1.0-1 - update to 8.1.0 GA -- cgit