From b4c3d76a9d5b0e63faac60d2f3120ba16b0e7274 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Nov 09 2020 07:33:42 +0000 Subject: v4.3.3 --- diff --git a/.gitignore b/.gitignore index 17d4534..7324ee1 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ clog /php-sabre-vobject4-4.3.0-5b2248d.tar.gz /php-sabre-vobject4-4.3.1-a7feca8.tar.gz /php-sabre-vobject4-4.3.2-e17daaf.tar.gz +/php-sabre-vobject4-4.3.3-58f9f9b.tar.gz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 28b0c9c..6b6c906 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit e17daaf92a12d39e93ab404929673573e3bb85bf +%global gh_commit 58f9f9b46a1080c0130bd86f4df9a568aacb9c79 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -25,7 +25,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.3.2 +Version: 4.3.3 Release: 1%{?dist} URL: http://sabre.io/vobject/ @@ -47,10 +47,16 @@ BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" -# "friendsofphp/php-cs-fixer": "~2.16.1", +# "friendsofphp/php-cs-fixer": "~2.16.7", # "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", # "phpstan/phpstan": "^0.12" -BuildRequires: phpunit8 >= 8.5 +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 +BuildRequires: phpunit9 +%global phpunit %{_bindir}/phpunit9 +%else +BuildRequires: phpunit8 +%global phpunit %{_bindir}/phpunit8 +%endif # Autoloader BuildRequires: php-composer(fedora/autoloader) %endif @@ -128,9 +134,10 @@ fi : Run upstream test suite against installed library ret=0 -for cmd in php php72 php73 php74 php80; do - if which $cmd; then - $cmd %{_bindir}/phpunit8 $opt || ret=1 +for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 fi done exit $ret @@ -151,6 +158,9 @@ exit $ret %endif %changelog +* Mon Nov 9 2020 Remi Collet - 4.3.3-1 +- update to 4.3.3 + * Mon Oct 5 2020 Remi Collet - 4.3.2-1 - update to 4.3.2 diff --git a/sources b/sources index f8d93e7..eb4abd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.3.2-e17daaf.tar.gz) = 0461bd016f58fea8e0e35065378501c6908b228d600a9b8836dbb396cdc4bcbba12d463d71e0f4656f3b6dc240216ba336f9edc757257958e991d9f8a5a8e178 +SHA512 (php-sabre-vobject4-4.3.3-58f9f9b.tar.gz) = 9b77d6a6e0b4c9cdf38cb6f48ab0ccdde3e08cdd221fd64c14dbbc9df85ae20f6140f2183ad871b29fbd86bbf57c44047fc9d2180b42b68733def4be9861bfea