rebuild using ICU 72

use SPDX license ID

1 files changed, 12 insertions, 27 deletions

diff --git a/php-pecl-http.spec b/php-pecl-http.spec
index 1d26ceb..862df9a 100644
--- a/php-pecl-http.spec
+++ b/php-pecl-http.spec
@@ -3,14 +3,13 @@
 #
 # Fedora spec file for php-pecl-http
 #
-# Copyright (c) 2012-2022 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2012-2023 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 %if 0%{?scl:1}
-%global sub_prefix %{scl_prefix}
 %scl_package       php-pecl-http
 %else
 %global _root_prefix %{_prefix}
@@ -40,18 +39,18 @@
 #global upstream_prever  beta1
 #global upstream_lower   beta1
 
-Name:           %{?sub_prefix}php-pecl-http
+Name:           %{?scl_prefix}php-pecl-http
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
 %if 0%{?gh_date:1}
 Release:        0.9.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
 %else
-Release:        2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Source0:        https://pecl.php.net/get/%{proj_name}-%{upstream_version}%{?upstream_prever}.tgz
 %endif
 Summary:        Extended HTTP support
 
-License:        BSD
+License:        BSD-2-Clause
 URL:            https://pecl.php.net/package/pecl_http
 
 # From http://www.php.net/manual/en/http.configuration.php
@@ -62,11 +61,10 @@ BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel >= 8.0
 BuildRequires:  %{?scl_prefix}php-spl
 BuildRequires:  %{?scl_prefix}php-pear
-BuildRequires:  pcre-devel
 BuildRequires:  zlib-devel >= 1.2.0.4
 BuildRequires:  curl-devel >= 7.18.2
-# We require 69 to ensure we use the same version than PHP
-BuildRequires:  pkgconfig(icu-i18n) >= 71
+# We require 72 to ensure we use the same version than PHP
+BuildRequires:  pkgconfig(icu-i18n) >= 72
 BuildRequires:  %{?scl_prefix}php-pecl-raphf-devel  >= 2
 BuildRequires:  pkgconfig(libevent) >= 2
 # only needed in F27+
@@ -89,25 +87,11 @@ Obsoletes:      %{?scl_prefix}php-pecl-propro < 2.2
 
 Provides:       %{?scl_prefix}php-pecl(%{proj_name})         = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{proj_name})%{?_isa} = %{version}
-%if "%{?scl_prefix}" != "%{?sub_prefix}"
-Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}
-Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}
-%endif
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
 
-%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-Obsoletes:     php73-pecl-http  <= %{version}
-Obsoletes:     php74-pecl-http  <= %{version}
-Obsoletes:     php80-pecl-http  <= %{version}
-%if "%{php_version}" > "8.1"
-Obsoletes:     php81-pecl-http  <= %{version}
-%endif
-%endif
-
 
 %description
 The HTTP extension aims to provide a convenient and powerful set of
@@ -131,10 +115,6 @@ Summary:       Extended HTTP support developer files (header)
 Requires:      %{name}%{?_isa} = %{version}-%{release}
 Requires:      %{?scl_prefix}php-devel%{?_isa} >= 5.3.0
 Obsoletes:     %{?scl_prefix}php-pecl-http1-devel < 2
-%if "%{?scl_prefix}" != "%{?sub_prefix}"
-Provides:      %{?scl_prefix}php-pecl-%{pecl_name}-devel          = %{version}
-Provides:      %{?scl_prefix}php-pecl-%{pecl_name}-devel%{?_isa}  = %{version}
-%endif
 
 %description devel
 These are the files needed to compile programs using HTTP extension.
@@ -237,6 +217,7 @@ done
 : ignore tests with erratic results
 rm ?TS/tests/client021.phpt
 rm ?TS/tests/client022.phpt
+rm ?TS/tests/client025.phpt
 rm ?TS/tests/client027.phpt
 
 export REPORT_EXIT_STATUS=1
@@ -335,6 +316,10 @@ fi
 
 
 %changelog
+* Thu May 11 2023 Remi Collet <remi@remirepo.net> - 4.2.3-3
+- rebuild using ICU 72
+- use SPDX license ID
+
 * Tue Sep  6 2022 Remi Collet <remi@remirepo.net> - 4.2.3-2
 - rebuild using ICU 71