From bbe6106bda8de542ae2434c2ccf0064200c7d5f9 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 5 Mar 2024 10:36:58 +0100
Subject: [PATCH] v2.0.4

(cherry picked from commit a004b05f39bacf5cf00ef6701946760c0e02293a)
---
 .gitignore                 |  1 +
 php-phar-io-manifest2.spec | 25 +++++++++++++------------
 sources                    |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index cd59b70..1a2a498 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /php-phar-io-manifest2-2.0.1-85265ef.tgz
 /php-phar-io-manifest2-2.0.3-97803ec.tgz
+/php-phar-io-manifest2-2.0.4-54750ef.tgz
diff --git a/php-phar-io-manifest2.spec b/php-phar-io-manifest2.spec
index c5b0635..2053578 100644
--- a/php-phar-io-manifest2.spec
+++ b/php-phar-io-manifest2.spec
@@ -1,7 +1,7 @@
 # remirepo/fedora spec file for php-phar-io-manifest2
 #
-# Copyright (c) 2017-2020 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2017-2024 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
@@ -13,7 +13,7 @@
 %bcond_without       tests
 %endif
 
-%global gh_commit    97803eca37d319dfa7826cc2437fc020857acb53
+%global gh_commit    54750ef60c58e43759730615a392c31c80e23176
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     phar-io
 %global gh_project   manifest
@@ -25,11 +25,11 @@
 %global php_home     %{_datadir}/php
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        2.0.3
-Release:        4%{?dist}
+Version:        2.0.4
+Release:        1%{?dist}
 Summary:        Component for reading phar.io manifest information
 
-License:        BSD
+License:        BSD-3-Clause
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        %{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
@@ -46,11 +46,7 @@ BuildRequires:  php-spl
 BuildRequires:  php-xmlwriter
 BuildRequires:  php-fedora-autoloader-devel >= 1.0.0
 %if %{with tests}
-%if 0%{?fedora} >= 32
 %global phpunit %{_bindir}/phpunit9
-%else
-%global phpunit %{_bindir}/phpunit8
-%endif
 BuildRequires:  %{phpunit}
 %endif
 
@@ -58,16 +54,17 @@ BuildRequires:  %{phpunit}
 #    "php": "^7.2 || ^8.0",
 #    "ext-dom": "*",
 #    "ext-phar": "*",
+#    "ext-libxml": "*",
 #    "ext-xmlwriter": "*",
 #    "phar-io/version": "^3.0.1"
 Requires:       php(language) >= 7.2
 Requires:       php-dom
 Requires:       php-phar
+Requires:       php-libxml
 Requires:       php-xmlwriter
 Requires:      (php-composer(%{pk_vendor}/version) >= 3.0.1 with php-composer(%{pk_vendor}/version) <  4)
 # from phpcompatinfo report for version 2.0.0
 Requires:       php-filter
-Requires:       php-libxml
 Requires:       php-pcre
 Requires:       php-spl
 # Autoloader
@@ -109,7 +106,7 @@ touch vendor/autoload.php
 
 : Run upstream test suite
 ret=0
-for cmd in "php %{phpunit}" php73 php74 php80 php81; do
+for cmd in "php %{phpunit}" php81 php82 php83; do
   if which $cmd; then
     set $cmd
     $1 -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
@@ -130,6 +127,10 @@ exit $ret
 
 
 %changelog
+* Tue Mar  5 2024 Remi Collet <remi@remirepo.net> - 2.0.4-1
+- update to 2.0.4
+- use SPDX license id
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 5a42d9c..b13fefd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-phar-io-manifest2-2.0.3-97803ec.tgz) = 0ef613a489c4574bb2260eca9e62a8c0d2d415dcc24b724f3efd739e885947c554deaac77099f627dd2568d2551dc72623c0a0b0122c4989ebfdba5d51b6e4ad
+SHA512 (php-phar-io-manifest2-2.0.4-54750ef.tgz) = 47fee531f06e93b3bd34baabce96d8d9dd5a5761f6e7bf8ff3a478f4203bbf76487b0b8280957816321b96702f3fff1cd870c6d69fef446da9363af1b0e50be0