From 2fc761df638b5cf18939e8c0be3bb58c89dd070d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Oct 2017 05:54:12 +0200 Subject: [PATCH 1/2] Update to 4.1.3 sources from https://github.com/sabre-io/vobject (cherry picked from commit 098df77f6806f26677f4a1479aa6a036a03d910e) --- .gitignore | 1 + ...-bin.patch => php-sabre-vobject4-bin.patch | 0 php-sabre-vobject4.spec | 28 +++++++++++++------ sources | 2 +- 4 files changed, 21 insertions(+), 10 deletions(-) rename sabre-vobject-bin.patch => php-sabre-vobject4-bin.patch (100%) diff --git a/.gitignore b/.gitignore index 6498780..ffac39a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ clog /php-sabre-vobject4-4.1.2-d0fde2f.tar.gz +/php-sabre-vobject4-4.1.3-df99168.tar.gz diff --git a/sabre-vobject-bin.patch b/php-sabre-vobject4-bin.patch similarity index 100% rename from sabre-vobject-bin.patch rename to php-sabre-vobject4-bin.patch diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 09fad2e..09b4b4c 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -6,10 +6,10 @@ # # Please, preserve the changelog entries # -%global gh_commit d0fde2fafa2a3dad1f559c2d1c2591d4fd75ae3c +%global gh_commit df9916813d1d83e4f761c4cba13361ee74196fac %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner fruux -%global gh_project sabre-vobject +%global gh_owner sabre-io +%global gh_project vobject %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %if 0%{?fedora} > 25 @@ -18,9 +18,9 @@ %global with_cmd 0 %endif -Name: php-%{gh_project}4 +Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.1.2 +Version: 4.1.3 Release: 1%{?dist} URL: http://sabre.io/vobject/ @@ -30,7 +30,7 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit Source1: %{name}-autoload.php # replace composer autloader -Patch0: %{gh_project}-bin.patch +Patch0: %{name}-bin.patch BuildArch: noarch %if %{with_tests} @@ -44,10 +44,10 @@ BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" -# "phpunit/phpunit" : "*", +# "phpunit/phpunit" : "> 4.8, <6.0.0", # "squizlabs/php_codesniffer": "*" # "sabre/cs" : "^1.0.0" -BuildRequires: php-composer(phpunit/phpunit) +BuildRequires: php-composer(phpunit/phpunit) > 4.8 # Autoloader BuildRequires: php-composer(fedora/autoloader) %endif @@ -118,7 +118,13 @@ cd tests sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php : Run upstream test suite against installed library -%{_bindir}/phpunit --verbose +ret=0 +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + $cmd %{_bindir}/phpunit --verbose || ret=1 + fi +done +exit $ret %else : Skip upstream test suite %endif @@ -136,6 +142,10 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php %endif %changelog +* Thu Oct 19 2017 Remi Collet - 4.1.3-1 +- Update to 4.1.3 +- sources from https://github.com/sabre-io/vobject + * Tue Jan 17 2017 Remi Collet - 4.1.2-1 - rename to php-sabre-vobject4 - raise dependency on PHP version 5.5 diff --git a/sources b/sources index 072dba5..355b579 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.1.2-d0fde2f.tar.gz) = 55c3b3845967d03003942a81cb3cafa65bedff5bba1a6eb3148de75ddeef99488fe3ca2a176879599addfcbe08cd13e54c221d49720a456e008334e541008954 +SHA512 (php-sabre-vobject4-4.1.3-df99168.tar.gz) = 75132170b6cd1adb1359a3f9ca3069b88ef06d46200c6511be375c3d6ffd00c1cab50476990eac31a0e866866dbcc3e6433a67734a074796ee09418e9aaea550 From 0508f0d597328f71c8557cb34a1dd2999f5d4ee4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 23 Dec 2017 07:23:05 +0100 Subject: [PATCH 2/2] v4.1.4 (cherry picked from commit 0eaa22b78a3f5269f0e8b5799100b57932e073e2) --- .gitignore | 1 + php-sabre-vobject4.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ffac39a..1ee8518 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ clog /php-sabre-vobject4-4.1.2-d0fde2f.tar.gz /php-sabre-vobject4-4.1.3-df99168.tar.gz +/php-sabre-vobject4-4.1.4-6484b9d.tar.gz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 09b4b4c..0a0934f 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit df9916813d1d83e4f761c4cba13361ee74196fac +%global gh_commit 6484b9d660822c5e221c76122ce8ea658ecc9c5b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -20,7 +20,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.1.3 +Version: 4.1.4 Release: 1%{?dist} URL: http://sabre.io/vobject/ @@ -44,10 +44,10 @@ BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" -# "phpunit/phpunit" : "> 4.8, <6.0.0", +# "phpunit/phpunit" : "> 4.8.35, <6.0.0", # "squizlabs/php_codesniffer": "*" # "sabre/cs" : "^1.0.0" -BuildRequires: php-composer(phpunit/phpunit) > 4.8 +BuildRequires: php-composer(phpunit/phpunit) > 4.8.35 # Autoloader BuildRequires: php-composer(fedora/autoloader) %endif @@ -90,6 +90,7 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm + cp %{SOURCE1} lib/autoload.php @@ -142,6 +143,9 @@ exit $ret %endif %changelog +* Sat Dec 23 2017 Remi Collet - 4.1.4-1 +- Update to 4.1.4 + * Thu Oct 19 2017 Remi Collet - 4.1.3-1 - Update to 4.1.3 - sources from https://github.com/sabre-io/vobject diff --git a/sources b/sources index 355b579..159221a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.1.3-df99168.tar.gz) = 75132170b6cd1adb1359a3f9ca3069b88ef06d46200c6511be375c3d6ffd00c1cab50476990eac31a0e866866dbcc3e6433a67734a074796ee09418e9aaea550 +SHA512 (php-sabre-vobject4-4.1.4-6484b9d.tar.gz) = 7d5bd6d343050835f87f64a37fdcbb8af8444bc76cc6b9a4a0ebbf1c9935f4e5db43e3e6db45f5989492f3a105a2a4382b470a16e23fa127b29efc7e7b8f7870