diff --git a/.gitignore b/.gitignore index ffac39a..7e57c5c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ 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 +/php-sabre-vobject4-4.1.6-122cacb.tar.gz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index d68becc..161ad6d 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -1,18 +1,22 @@ # 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 df9916813d1d83e4f761c4cba13361ee74196fac + +# 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 %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,12 +24,11 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.1.3 +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 @@ -36,18 +39,22 @@ 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 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 @@ -58,8 +65,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 @@ -90,6 +101,7 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm + cp %{SOURCE1} lib/autoload.php @@ -119,7 +131,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 @@ -142,6 +154,17 @@ 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+ + +* 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..625aee0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.1.3-df99168.tar.gz) = 75132170b6cd1adb1359a3f9ca3069b88ef06d46200c6511be375c3d6ffd00c1cab50476990eac31a0e866866dbcc3e6433a67734a074796ee09418e9aaea550 +SHA512 (php-sabre-vobject4-4.1.6-122cacb.tar.gz) = 6f3233bdf7c079949e6003df68f0ca0b1a946374e3bc676370eecc853e7cca51924b286ebf04facfd0793a2de6b3ede2e82f40de2fce9d38979a2769e0089218