diff --git a/.gitignore b/.gitignore index 74b034d..79dcf62 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ clog /php-sabre-vobject4-4.4.3-2a043b9.tgz /php-sabre-vobject4-4.5.0-d1fdc0c.tgz /php-sabre-vobject4-4.5.1-1f83674.tgz +/php-sabre-vobject4-4.5.3-fe6d918.tgz diff --git a/php-sabre-vobject4-autoload.php b/php-sabre-vobject4-autoload.php deleted file mode 100644 index 57829aa..0000000 --- a/php-sabre-vobject4-autoload.php +++ /dev/null @@ -1,10 +0,0 @@ -= 7.1 BuildRequires: php-mbstring -BuildRequires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) +BuildRequires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 5) 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", +# "friendsofphp/php-cs-fixer": "^2.17.1", # "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", # "phpunit/php-invoker" : "^2.0 || ^3.1", # "phpstan/phpstan": "^0.12" 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", # "ext-mbstring" : "*", -# "sabre/xml" : "^2.1" +# "sabre/xml" : "^2.1 || ^3.0 || ^4.0" Requires: php(language) >= 7.1 Requires: php-mbstring # -Requires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) +Requires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 5) # From phpcompatinfo report for version 4.1.2 %if %{with_cmd} Requires: php-cli @@ -97,7 +96,19 @@ 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', + '%{_datadir}/php/Sabre/Xml2/autoload.php', + ], +]); +EOF %build @@ -139,7 +150,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 @@ -162,6 +173,11 @@ exit $ret %endif %changelog +* Wed Jan 25 2023 Remi Collet - 4.5.3-1 +- update to 4.5.3 +- low dependency on PHP 7.1 +- low dependency on sabre/xml v2 + * Fri Jan 20 2023 Fedora Release Engineering - 4.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index b512811..aa51a9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.5.1-1f83674.tgz) = 2d6df21a8ef43b155f139105b662cb4ae84374110aa4187324fd775b5d71cd05fc467efe1a95dadd07b755585cf2c1bd63095a22e8747548c021be7dad1adcd2 +SHA512 (php-sabre-vobject4-4.5.3-fe6d918.tgz) = 4aab893c740ae1a0b770ded667f95b06d02bf172bb4cfb82bb18e7dd604620e8009d3fe9c4b555fa228b72f002bfedf3a82dd9533c4093cef8b94e8ab2713c7a