From 5b38290883b6305066931b2add4553d8393ddae1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 11 May 2023 11:01:43 +0200
Subject: define %php80___phpize and %php80___phpconfig

---
 failed.txt |  2 +-
 macros.php |  4 ++++
 php.spec   | 49 ++++++++++++++++++++++++-------------------------
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/failed.txt b/failed.txt
index 3d686f8..e505da5 100644
--- a/failed.txt
+++ b/failed.txt
@@ -7,7 +7,7 @@ $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 /var/lib/mock/scl80el9x/build.log:Tests failed     :    3
 /var/lib/mock/scl80fc36x/build.log:Tests failed    :    3
 /var/lib/mock/scl80fc37x/build.log:Tests failed    :    3
-/var/lib/mock/scl80fc38x/build.log:Tests failed    :    3
+/var/lib/mock/scl80fc38x/build.log:Tests failed    :    5
 
 
 all:
diff --git a/macros.php b/macros.php
index 3943a74..d3e937f 100644
--- a/macros.php
+++ b/macros.php
@@ -14,3 +14,7 @@
 
 %@SCL@__php        @BINDIR@/php
 
+%@SCL@__phpize     @BINDIR@/phpize
+
+%@SCL@__phpconfig  @BINDIR@/php-config
+
diff --git a/php.spec b/php.spec
index 0f77345..659a516 100644
--- a/php.spec
+++ b/php.spec
@@ -119,7 +119,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}}
-Release: 3%{?dist}
+Release: 4%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -946,43 +946,39 @@ in pure PHP.
 %setup -q -n php-%{upver}%{?rcver}
 %endif
 
-%patch1 -p1 -b .mpmcheck
-%patch5 -p1 -b .includedir
-%patch6 -p1 -b .embed
-%patch8 -p1 -b .libdb
-%patch9 -p1 -b .deprecated
-%if 0%{?rhel}
-%patch10 -p1 -b .curltls
+%patch -P1 -p1 -b .mpmcheck
+%patch -P5 -p1 -b .includedir
+%patch -P6 -p1 -b .embed
+%patch -P8 -p1 -b .libdb
+%patch -P9 -p1 -b .deprecated
+%if 0%{?rhel} == 7
+%patch -P10 -p1 -b .curltls
 %endif
 
-%patch41 -p1 -b .syslib
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 6
-%patch42 -p1 -b .systzdata
-%endif
-%patch43 -p1 -b .headers
+%patch -P41 -p1 -b .syslib
+%patch -P42 -p1 -b .systzdata
+%patch -P43 -p1 -b .headers
 sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-%patch45 -p1 -b .ldap_r
-%endif
-%patch46 -p1 -b .argon2
-%patch47 -p1 -b .phpinfo
-%patch48 -p1 -b .sha
-%patch49 -p1 -b .pharsha
+%patch -P45 -p1 -b .ldap_r
+%patch -P46 -p1 -b .argon2
+%patch -P47 -p1 -b .phpinfo
+%patch -P48 -p1 -b .sha
+%patch -P49 -p1 -b .pharsha
 %if 0%{?fedora} >= 36|| 0%{?rhel} >= 9
-%patch50 -p1 -b .openssl3
+%patch -P50 -p1 -b .openssl3
 rm ext/openssl/tests/p12_with_extra_certs.p12
 %endif
-%patch51 -p1 -b .libxcrypt
-%patch52 -p1 -b .intlinfo
+%patch -P51 -p1 -b .libxcrypt
+%patch -P52 -p1 -b .intlinfo
 
-%patch91 -p1 -b .remi-oci8
+%patch -P91 -p1 -b .remi-oci8
 
 # upstream patches
 
 # security patches
 
 # Fixes for tests
-%patch300 -p1 -b .datetests
+%patch -P300 -p1 -b .datetests
 
 # WIP patch
 
@@ -1858,6 +1854,9 @@ fi
 
 
 %changelog
+* Thu May 11 2023 Remi Collet <remi@remirepo.net> - 8.0.28-4
+- define %%php80___phpize and %%php80___phpconfig
+
 * Fri Apr 21 2023 Remi Collet <remi@remirepo.net> - 8.0.28-3
 - use ICU 72.1
 - use oracle client library version 21.10
-- 
cgit