From 9c3bee0187942a2451abff3ab7abb04d02e363ae Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 23 Feb 2022 15:16:47 +0100
Subject: retrieve tzdata version

use oracle client library version 21.5
---
 php73.spec | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'php73.spec')

diff --git a/php73.spec b/php73.spec
index 689597c..492f095 100644
--- a/php73.spec
+++ b/php73.spec
@@ -25,7 +25,7 @@
 
 %global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock)
 
-%global oraclever 21.3
+%global oraclever 21.5
 %global oraclelib 21.1
 
 # Build for LiteSpeed Web Server (LSAPI)
@@ -111,7 +111,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 1%{?dist}
+Release: 2%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -156,7 +156,7 @@ Patch9: php-7.0.7-curl.patch
 
 # Functional changes
 Patch40: php-7.2.4-dlopen.patch
-Patch42: php-7.3.3-systzdata-v18.patch
+Patch42: php-7.3.3-systzdata-v19.patch
 # See http://bugs.php.net/53436
 Patch43: php-7.3.0-phpize.patch
 # Use -lldap_r for OpenLDAP
@@ -853,12 +853,7 @@ License: PHP and BSD
 %endif
 Requires: php-common%{?_isa} = %{version}-%{release}
 %if %{with_libgd}
-BuildRequires: gd-devel >= 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: gd-devel >= 2.3
 %else
 # Required to build the bundled GD library
 BuildRequires: libjpeg-devel
@@ -1197,14 +1192,9 @@ mkdir build-cgi build-apache build-embedded \
 # ----- Manage known as failed test -------
 # affected by systzdata patch
 rm ext/date/tests/timezone_location_get.phpt
-rm ext/date/tests/timezone_version_get.phpt
-rm ext/date/tests/timezone_version_get_basic1.phpt
-%if 0%{?fedora} < 28
-# need tzdata 2018i
 rm ext/date/tests/bug33414-1.phpt
 rm ext/date/tests/bug33415-2.phpt
 rm ext/date/tests/date_modify-1.phpt
-%endif
 # too fast builder
 rm ext/date/tests/bug73837.phpt
 # Should be skipped but fails sometime
@@ -1983,7 +1973,7 @@ sed -e "s/@PHP_APIVER@/%{apiver}%{isasuffix}/" \
 %endif
     < %{SOURCE3} > macros.php
 %if 0%{?fedora} >= 24 || 0%{?rhel} >= 8
-echo '%pecl_xmldir   %{_localstatedir}/lib/php/peclxml' >>macros.php
+echo '%%pecl_xmldir   %{_localstatedir}/lib/php/peclxml' >>macros.php
 %endif
 install -m 644 -D macros.php \
            $RPM_BUILD_ROOT%{macrosdir}/macros.php
@@ -2256,6 +2246,10 @@ fi
 
 
 %changelog
+* Wed Feb 23 2022 Remi Collet <remi@remirepo.net> - 7.3.33-2
+- retrieve tzdata version
+- use oracle client library version 21.5
+
 * Tue Nov 16 2021 Remi Collet <remi@remirepo.net> - 7.3.33-1
 - Update to 7.3.33 - http://www.php.net/releases/7_3_33.php
 
-- 
cgit