diff options
Diffstat (limited to 'php-sabre-vobject4.spec')
| -rw-r--r-- | php-sabre-vobject4.spec | 63 |
1 files changed, 40 insertions, 23 deletions
diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index f391906..7aba02c 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -1,7 +1,7 @@ # remirepo/fedora spec file for php-sabre-vobject4 # -# Copyright (c) 2013-2022 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2013-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 1f836740c88bac483f3b572a332eb8fd1cd04981 +%global gh_commit 5f6665f08b8c4c6b47a5cf94bf14f6f6bea30530 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -25,13 +25,12 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.5.1 +Version: 4.5.2 Release: 1%{?dist} URL: http://sabre.io/vobject/ -License: BSD +License: BSD-3-Clause Source0: %{name}-%{version}-%{gh_short}.tgz -Source1: %{name}-autoload.php Source2: makesrc.sh # replace composer autloader @@ -39,51 +38,52 @@ Patch0: %{name}-bin.patch BuildArch: noarch %if %{with tests} -BuildRequires: php(language) >= 7.1 +BuildRequires: php(language) >= 7.4 +BuildRequires: php-json BuildRequires: php-mbstring # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) +BuildRequires: (php-composer(sabre/xml) >= 3.0 with php-composer(sabre/xml) < 5) # remirepo:3 %else -BuildRequires: php-sabre-xml2 >= 2.1 +BuildRequires: php-sabre-xml4 %endif BuildRequires: php-date -BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" -# "friendsofphp/php-cs-fixer": "~2.17.1", -# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", +# "friendsofphp/php-cs-fixer": "^3.10.0", +# "phpunit/phpunit" : "^9.0", # "phpunit/php-invoker" : "^2.0 || ^3.1", -# "phpstan/phpstan": "^0.12" +# "phpstan/phpstan": "^1.8" BuildRequires: phpunit9 %global phpunit %{_bindir}/phpunit9 -# Autoloader -BuildRequires: php-composer(fedora/autoloader) %endif +# Autoloader +BuildRequires: php-fedora-autoloader-devel # From composer.json, "require" -# "php" : "^7.1 || ^8.0", +# "php" : "^7.4 || ^8.0", # "ext-mbstring" : "*", -# "sabre/xml" : "^2.1" -Requires: php(language) >= 7.1 +# "ext-json" : "*", +# "sabre/xml" : "^3.0 || ^4.0" +Requires: php(language) >= 7.4 +Requires: php-json Requires: php-mbstring # # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) +Requires: (php-composer(sabre/xml) >= 3.0 with php-composer(sabre/xml) < 5) # remirepo:3 %else -Requires: php-sabre-xml2 >= 2.1 +Requires: php-sabre-xml4 %endif # From phpcompatinfo report for version 4.1.2 %if %{with_cmd} Requires: php-cli %endif Requires: php-date -Requires: php-json Requires: php-pcre Requires: php-spl Requires: php-xml @@ -109,7 +109,18 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php %patch0 -p1 -b .rpm -cp %{SOURCE1} lib/autoload.php +phpab -t fedora -o lib/autoload.php lib + +cat << 'EOF' | tee -a lib/autoload.php + +// Dependencies +\Fedora\Autoloader\Dependencies::required([ + [ + '%{_datadir}/php/Sabre/Xml4/autoload.php', + '%{_datadir}/php/Sabre/Xml3/autoload.php', + ], +]); +EOF %build @@ -151,7 +162,7 @@ fi : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do +for cmdarg in "php %{phpunit}" php80 php81 php82; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 @@ -176,6 +187,12 @@ exit $ret %endif %changelog +* Fri Jan 20 2023 Remi Collet <remi@remirepo.net> - 4.5.2-1 +- update to 4.5.2 +- raise dependency on PHP 7.4 +- raise dependency on sabre/xml v3 or v4 +- switch to classmap autoloader + * Mon Oct 10 2022 Remi Collet <remi@remirepo.net> - 4.5.1-1 - update to 4.5.1 |