diff --git a/.gitignore b/.gitignore index d08f6a4..1745276 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ clog /php-sabre-vobject4-4.2.0-bd50001.tar.gz /php-sabre-vobject4-4.2.1-6d7476f.tar.gz /php-sabre-vobject4-4.2.2-449616b.tar.gz +/php-sabre-vobject4-4.3.0-5b2248d.tar.gz diff --git a/php-sabre-vobject4-autoload.php b/php-sabre-vobject4-autoload.php index 71664f5..57829aa 100644 --- a/php-sabre-vobject4-autoload.php +++ b/php-sabre-vobject4-autoload.php @@ -5,9 +5,6 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Sabre\\VObject\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ - [ - '/usr/share/php/Sabre/Xml2/autoload.php', - '/usr/share/php/Sabre/Xml/autoload.php', - ], + '/usr/share/php/Sabre/Xml2/autoload.php', ]); diff --git a/php-sabre-vobject4-bin.patch b/php-sabre-vobject4-bin.patch index 96e112d..1a6b2ac 100644 --- a/php-sabre-vobject4-bin.patch +++ b/php-sabre-vobject4-bin.patch @@ -1,6 +1,6 @@ diff -up ./bin/generate_vcards.rpm ./bin/generate_vcards ---- ./bin/generate_vcards.rpm 2020-01-14 11:18:45.000000000 +0100 -+++ ./bin/generate_vcards 2020-01-14 14:13:58.718903396 +0100 +--- ./bin/generate_vcards.rpm 2020-01-31 19:50:58.000000000 +0100 ++++ ./bin/generate_vcards 2020-02-01 07:56:20.162307853 +0100 @@ -6,8 +6,7 @@ namespace Sabre\VObject; // This sucks.. we have to try to find the composer autoloader. But chances // are, we can't find it this way. So we'll do our bestest @@ -21,8 +21,8 @@ diff -up ./bin/generate_vcards.rpm ./bin/generate_vcards } diff -up ./bin/vobject.rpm ./bin/vobject ---- ./bin/vobject.rpm 2020-01-14 11:18:45.000000000 +0100 -+++ ./bin/vobject 2020-01-14 14:13:58.718903396 +0100 +--- ./bin/vobject.rpm 2020-01-31 19:50:58.000000000 +0100 ++++ ./bin/vobject 2020-02-01 07:56:20.162307853 +0100 @@ -6,8 +6,7 @@ namespace Sabre\VObject; // This sucks.. we have to try to find the composer autoloader. But chances // are, we can't find it this way. So we'll do our bestest @@ -43,8 +43,8 @@ diff -up ./bin/vobject.rpm ./bin/vobject } diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2020-01-14 11:18:45.000000000 +0100 -+++ ./tests/bootstrap.php 2020-01-14 14:15:34.557472825 +0100 +--- ./tests/bootstrap.php.rpm 2020-01-31 19:50:58.000000000 +0100 ++++ ./tests/bootstrap.php 2020-02-01 07:57:56.802761882 +0100 @@ -3,8 +3,7 @@ date_default_timezone_set('UTC'); @@ -55,12 +55,10 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ]; foreach ($try as $path) { -@@ -14,6 +13,8 @@ foreach ($try as $path) { +@@ -13,3 +12,6 @@ foreach ($try as $path) { + break; } } - ++ +\Fedora\Autoloader\Autoload::addPsr4('Sabre\\VObject\\', __DIR__ . '/VObject'); + - if (!defined('SABRE_TEMPDIR')) { - define('SABRE_TEMPDIR', __DIR__.'/temp/'); - } diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index eb2e271..01e7d66 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 449616b2d45b95c8973975de23f34a3d14f63b4b +%global gh_commit 5b2248d965160f93053f3a24704794a13a22a1bb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -24,8 +24,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.2.2 -Release: 2%{?dist} +Version: 4.3.0 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -37,29 +37,30 @@ Patch0: %{name}-bin.patch BuildArch: noarch %if %{with_tests} -BuildRequires: php(language) >= 5.5 +BuildRequires: php(language) >= 7.1 BuildRequires: php-mbstring -BuildRequires: (php-composer(sabre/xml) >= 1.5 with php-composer(sabre/xml) < 3) +BuildRequires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) BuildRequires: php-date BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" -# "phpunit/phpunit" : "> 4.8.35, <6.0.0" -BuildRequires: php-composer(phpunit/phpunit) > 4.8.35 +# "friendsofphp/php-cs-fixer": "~2.16.1", +# "phpunit/phpunit" : "^7 || ^8" +BuildRequires: phpunit8 # Autoloader BuildRequires: php-composer(fedora/autoloader) %endif # From composer.json, "require" -# "php" : ">=5.5", +# "php" : "^7.1", # "ext-mbstring" : "*", -# "sabre/xml" : ">=1.5 <3.0" -Requires: php(language) >= 5.5 +# "sabre/xml" : "^2.1" +Requires: php(language) >= 7.1 Requires: php-mbstring # -Requires: (php-composer(sabre/xml) >= 1.5 with php-composer(sabre/xml) < 3) +Requires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) # From phpcompatinfo report for version 4.1.2 %if %{with_cmd} Requires: php-cli @@ -125,9 +126,9 @@ fi : Run upstream test suite against installed library ret=0 -for cmd in php php71 php72 php73 php74; do +for cmd in php php72 php73 php74; do if which $cmd; then - $cmd %{_bindir}/phpunit $opt || ret=1 + $cmd %{_bindir}/phpunit8 $opt || ret=1 fi done exit $ret @@ -148,6 +149,12 @@ exit $ret %endif %changelog +* Sat Feb 1 2020 Remi Collet - 4.3.0-1 +- update to 4.3.0 +- raise dependency on PHP 7.1 +- raise dependency on sabre/xml 2.1 +- switch to phpunit8 + * Thu Jan 30 2020 Fedora Release Engineering - 4.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index ea3d8f9..709bf3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.2.2-449616b.tar.gz) = 46e9e798fed6d3bf5795fbf5c29bf6c20075529d572d951ed36b92e6e06c992f909b45291736a3206363239ee048d4a4c4bec539e1a37dbfa476b85e5c972e99 +SHA512 (php-sabre-vobject4-4.3.0-5b2248d.tar.gz) = d62e83d84eb01a7a53ca0ad8eb54604685827a7038ae0039eb44f792a31aa8992fe662fc84d76b37d2246b54c902624d84399a5d2a37b642ad8de4536c148c5e