From 0eaa22b78a3f5269f0e8b5799100b57932e073e2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 23 Dec 2017 07:23:05 +0100 Subject: [PATCH 1/3] v4.1.4 --- .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 d68becc..8ebe19a 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 From fb0a061840fe28e51fed9cb9e0b49776f86beedf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 9 Mar 2018 07:09:10 +0100 Subject: [PATCH 2/3] update to 4.1.5 use range dependencies on F27+ (cherry picked from commit ed24b462127482e36bc12f359f5d1e2aeef04553) --- .gitignore | 1 + php-sabre-vobject4.spec | 22 +++++++++++++++++----- sources | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 1ee8518..48e4128 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,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 +/php-sabre-vobject4-4.1.5-0928660.tar.gz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 8ebe19a..e312418 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -1,18 +1,18 @@ # remirepo/fedora spec file for php-sabre-vobject4 # -# Copyright (c) 2013-2017 Remi Collet +# Copyright (c) 2013-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit 6484b9d660822c5e221c76122ce8ea658ecc9c5b +%global gh_commit 0928660e92d46d2d24336a6db320636aa3a75414 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject %global with_tests %{?_without_tests:0}%{!?_without_tests:1} -%if 0%{?fedora} > 25 +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 %global with_cmd 1 %else %global with_cmd 0 @@ -20,7 +20,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.1.4 +Version: 4.1.5 Release: 1%{?dist} URL: http://sabre.io/vobject/ @@ -36,8 +36,12 @@ BuildArch: noarch %if %{with_tests} BuildRequires: php(language) >= 5.5 BuildRequires: php-mbstring +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(sabre/xml) >= 1.5 with php-composer(sabre/xml) < 3) +%else BuildRequires: php-composer(sabre/xml) < 3 BuildRequires: php-composer(sabre/xml) >= 1.5 +%endif BuildRequires: php-date BuildRequires: php-json BuildRequires: php-pcre @@ -58,8 +62,12 @@ BuildRequires: php-composer(fedora/autoloader) # "sabre/xml" : ">=1.5 <3.0" Requires: php(language) >= 5.5 Requires: php-mbstring +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(sabre/xml) >= 1.5 with php-composer(sabre/xml) < 3) +%else Requires: php-composer(sabre/xml) >= 1.5 Requires: php-composer(sabre/xml) < 3 +%endif # From phpcompatinfo report for version 4.1.2 %if %{with_cmd} Requires: php-cli @@ -120,7 +128,7 @@ sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php : Run upstream test suite against installed library ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php php70 php71 php72; do if which $cmd; then $cmd %{_bindir}/phpunit --verbose || ret=1 fi @@ -143,6 +151,10 @@ exit $ret %endif %changelog +* Fri Mar 9 2018 Remi Collet - 4.1.5-1 +- update to 4.1.5 +- use range dependencies on F27+ + * Sat Dec 23 2017 Remi Collet - 4.1.4-1 - Update to 4.1.4 diff --git a/sources b/sources index 159221a..ef97d6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.1.4-6484b9d.tar.gz) = 7d5bd6d343050835f87f64a37fdcbb8af8444bc76cc6b9a4a0ebbf1c9935f4e5db43e3e6db45f5989492f3a105a2a4382b470a16e23fa127b29efc7e7b8f7870 +SHA512 (php-sabre-vobject4-4.1.5-0928660.tar.gz) = 92dca982c4573791e37ddc139d865af27b2aa64a9a33c19fd59d7deb82dd3e3286a903ea9ae3f941a3f754d1fd31290ad7211b7ca80eb2d4e48a6e062a47cb3c From c6ed5ad309ab9ad14e915b5290c93831fc44bf9c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 20 Apr 2018 09:40:06 +0200 Subject: [PATCH 3/3] update to 4.1.6 undefine __brp_mangle_shebangs (cherry picked from commit 2a6b431f93184e907c7a4d0890bf5d4d8dfc3c11) --- .gitignore | 1 + php-sabre-vobject4.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 48e4128..7e57c5c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ clog /php-sabre-vobject4-4.1.3-df99168.tar.gz /php-sabre-vobject4-4.1.4-6484b9d.tar.gz /php-sabre-vobject4-4.1.5-0928660.tar.gz +/php-sabre-vobject4-4.1.6-122cacb.tar.gz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index e312418..161ad6d 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -6,7 +6,11 @@ # # Please, preserve the changelog entries # -%global gh_commit 0928660e92d46d2d24336a6db320636aa3a75414 + +# For compatibility with SCL +%undefine __brp_mangle_shebangs + +%global gh_commit 122cacbdea2c6133ac04db86ec05854beef75adf %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -20,12 +24,11 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.1.5 +Version: 4.1.6 Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD -Group: Development/Libraries Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz Source1: %{name}-autoload.php @@ -151,6 +154,10 @@ exit $ret %endif %changelog +* Fri Apr 20 2018 Remi Collet - 4.1.6-1 +- update to 4.1.6 +- undefine __brp_mangle_shebangs + * Fri Mar 9 2018 Remi Collet - 4.1.5-1 - update to 4.1.5 - use range dependencies on F27+ diff --git a/sources b/sources index ef97d6d..625aee0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.1.5-0928660.tar.gz) = 92dca982c4573791e37ddc139d865af27b2aa64a9a33c19fd59d7deb82dd3e3286a903ea9ae3f941a3f754d1fd31290ad7211b7ca80eb2d4e48a6e062a47cb3c +SHA512 (php-sabre-vobject4-4.1.6-122cacb.tar.gz) = 6f3233bdf7c079949e6003df68f0ca0b1a946374e3bc676370eecc853e7cca51924b286ebf04facfd0793a2de6b3ede2e82f40de2fce9d38979a2769e0089218