diff --git a/.gitignore b/.gitignore index 945f339..7324ee1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ clog /php-sabre-vobject4-4.2.2-449616b.tar.gz /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 a119b0c..ca5e240 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -7,14 +7,15 @@ # Please, preserve the changelog entries # +%bcond_without tests + # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit a7feca8311462e5da16952454e420b92c20d3586 +%global gh_commit 58f9f9b46a1080c0130bd86f4df9a568aacb9c79 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject -%bcond_without tests %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 %global with_cmd 1 @@ -24,7 +25,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.3.1 +Version: 4.3.3 Release: 1%{?dist} URL: http://sabre.io/vobject/ @@ -46,16 +47,22 @@ 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 # From composer.json, "require" -# "php" : "^7.1", +# "php" : "^7.1 || ^8.0", # "ext-mbstring" : "*", # "sabre/xml" : "^2.1" Requires: php(language) >= 7.1 @@ -127,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 @@ -150,6 +158,9 @@ exit $ret %endif %changelog +* Mon Nov 9 2020 Remi Collet - 4.3.3-1 +- update to 4.3.3 + * Mon Jul 13 2020 Remi Collet - 4.3.1-1 - update to 4.3.1 diff --git a/sources b/sources index a4c489b..eb4abd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.3.1-a7feca8.tar.gz) = 192d1d676a982a8c4193396860aa25dc97908d89866f12ae66c4f2943a59b39dfd1b0c77d375accd89e28e995237191bf0a830915af77563ee5844c7c96d960c +SHA512 (php-sabre-vobject4-4.3.3-58f9f9b.tar.gz) = 9b77d6a6e0b4c9cdf38cb6f48ab0ccdde3e08cdd221fd64c14dbbc9df85ae20f6140f2183ad871b29fbd86bbf57c44047fc9d2180b42b68733def4be9861bfea