diff options
| -rw-r--r-- | composer.json | 7 | ||||
| -rw-r--r-- | php-sebastian-exporter3.spec | 33 |
2 files changed, 30 insertions, 10 deletions
diff --git a/composer.json b/composer.json index 33fc5bd..b49f953 100644 --- a/composer.json +++ b/composer.json @@ -23,9 +23,14 @@ }, { "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" + "email": "bschussek@gmail.com" } ], + "config": { + "optimize-autoloader": true, + "sort-packages": true + }, + "prefer-stable": true, "require": { "php": "^7.0", "sebastian/recursion-context": "^3.0" diff --git a/php-sebastian-exporter3.spec b/php-sebastian-exporter3.spec index ac7bad3..ee5fd4b 100644 --- a/php-sebastian-exporter3.spec +++ b/php-sebastian-exporter3.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-sebastian-exporter3 # -# Copyright (c) 2013-2017 Remi Collet +# Copyright (c) 2013-2019 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 234199f4528de6d12aaa58b612e98f7d36adb937 +%global gh_commit 06a9a5947f47b3029d76118eb5c22802e5869687 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project exporter @@ -24,11 +24,10 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.1.0 +Version: 3.1.1 Release: 1%{?dist} Summary: Export PHP variables for visualization -Group: Development/Libraries 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 @@ -42,15 +41,22 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-mbstring": "*" BuildRequires: phpunit6 BuildRequires: php-mbstring -BuildRequires: php-composer(%{pk_vendor}/recursion-context) >= 3.0 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(%{pk_vendor}/recursion-context) >= 3.0 with php-composer(%{pk_vendor}/recursion-context) < 4) +%else +BuildRequires: php-sebastian-recursion-context3 +%endif %endif # from composer.json # "php": "^7.0", # "sebastian/recursion-context": "^3.0" Requires: php(language) >= 7.0 -Requires: php-composer(%{pk_vendor}/recursion-context) >= 3.0 -Requires: php-composer(%{pk_vendor}/recursion-context) < 4 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(%{pk_vendor}/recursion-context) >= 3.0 with php-composer(%{pk_vendor}/recursion-context) < 4) +%else +Requires: php-sebastian-recursion-context3 +%endif # from phpcompatinfo report for version 3.0.0 Requires: php-mbstring Requires: php-pcre @@ -71,7 +77,7 @@ Provides the functionality to export PHP variables for visualization. %build # generate the Autoloader -phpab --template fedora2 --output src/autoload.php src +phpab --template fedora --output src/autoload.php src # Rely on include_path as in PHPUnit dependencies cat <<EOF | tee -a src/autoload.php @@ -92,7 +98,7 @@ touch vendor/autoload.php : Run upstream test suite ret=0 -for cmd in php70 php71 php; do +for cmd in php php70 php71 php72 php73 php74; do if which $cmd; then %{_bindir}/php -d include_path=.:%{buildroot}%{_datadir}/php:%{_datadir}/php \ %{_bindir}/phpunit6 --verbose || ret=1 @@ -111,6 +117,15 @@ exit $ret %changelog +* Mon Aug 12 2019 Remi Collet <remi@remirepo.net> - 3.1.1-1 +- update to 3.1.1 + +* Thu Dec 6 2018 Remi Collet <remi@remirepo.net> - 3.1.0-5 +- cleanup for EL-8 + +* Tue Feb 6 2018 Remi Collet <remi@remirepo.net> - 3.1.0-3 +- use range dependencies on F27+ + * Mon Apr 3 2017 Remi Collet <remi@remirepo.net> - 3.1.0-1 - Update to 3.1.0 |