diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-phar-io-manifest.spec | 42 |
2 files changed, 30 insertions, 14 deletions
diff --git a/composer.json b/composer.json index 832134d..de14831 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "php": "^5.6 || ^7.0", "ext-dom": "*", "ext-phar": "*", - "phar-io/version": "^1.0.1" + "phar-io/version": "2.0.0" }, "autoload": { "classmap": [ diff --git a/php-phar-io-manifest.spec b/php-phar-io-manifest.spec index 6c46b59..ee747e6 100644 --- a/php-phar-io-manifest.spec +++ b/php-phar-io-manifest.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-phar-io-manifest # -# Copyright (c) 2017 Remi Collet +# Copyright (c) 2017-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 2df402786ab5368a0169091f61a7c1e0eb6852d0 +%global gh_commit 7761fcacf03b4d4f16e7ccb606d4879ca431fcf4 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phar-io %global gh_project manifest @@ -24,7 +24,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 1.0.1 +Version: 1.0.3 Release: 1%{?dist} Summary: Component for reading phar.io manifest information @@ -33,15 +33,19 @@ License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz -# https://github.com/phar-io/manifest/pull/2 -Patch0: %{name}-pr2.patch - BuildArch: noarch +# PHP 7 for phpunit6 BuildRequires: php(language) >= 5.6 BuildRequires: php-dom BuildRequires: php-phar -BuildRequires: php-composer(%{pk_vendor}/version) < 2 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(%{pk_vendor}/version) >= 1.0.1 with php-composer(%{pk_vendor}/version) < 3) +# remirepo:4 +%else +BuildRequires: php-composer(%{pk_vendor}/version) < 3 BuildRequires: php-composer(%{pk_vendor}/version) >= 1.0.1 +%endif BuildRequires: php-filter BuildRequires: php-libxml BuildRequires: php-pcre @@ -56,12 +60,19 @@ BuildRequires: phpunit6 # "php": "^5.6 || ^7.0", # "ext-dom": "*", # "ext-phar": "*", -# "phar-io/version": "^1.0.1" +# ignore exact version, test suite passes with 1.0.1 +# "phar-io/version": "2.0.0" Requires: php(language) >= 5.6 Requires: php-dom Requires: php-phar -Requires: php-composer(%{pk_vendor}/version) < 2 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(%{pk_vendor}/version) >= 1.0.1 with php-composer(%{pk_vendor}/version) < 3) +# remirepo:4 +%else +Requires: php-composer(%{pk_vendor}/version) < 3 Requires: php-composer(%{pk_vendor}/version) >= 1.0.1 +%endif # from phpcompatinfo report for version 1.0.1 Requires: php-filter Requires: php-libxml @@ -82,7 +93,6 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -b .pr2 %build @@ -109,10 +119,10 @@ ln -s %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php ve : Run upstream test suite ret=0 -for cmd in php70 php71 php; do +for cmd in php php70 php71 php72 php73; do if which $cmd; then - %{_bindir}/php -d include_path=.:%{buildroot}%{_datadir}/php:%{_datadir}/php \ - %{_bindir}/phpunit6 --verbose || ret=1 + $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ + %{_bindir}/phpunit6 --verbose || ret=1 fi done exit $ret @@ -129,6 +139,12 @@ exit $ret %changelog +* Mon Jul 16 2018 Remi Collet <remi@remirepo.net> - 1.0.3-1 +- update to 1.0.3 +- allow phar-io/version 2.0 +- drop patch merged upstream +- use range dependencies on F27+ + * Fri Apr 7 2017 Remi Collet <remi@remirepo.net> - 1.0.1-1 - initial package |