diff options
| -rw-r--r-- | composer.json | 16 | ||||
| -rw-r--r-- | php-tecnickcom-tc-lib-pdf-graph.spec | 40 |
2 files changed, 39 insertions, 17 deletions
diff --git a/composer.json b/composer.json index 50fe058..3b93ef8 100644 --- a/composer.json +++ b/composer.json @@ -21,18 +21,18 @@ "require": { "php": ">=5.4", "ext-zlib": "*", - "tecnickcom/tc-lib-color": "^1.12.7", - "tecnickcom/tc-lib-pdf-encrypt": "^1.5.4" + "tecnickcom/tc-lib-color": "^1.12.10", + "tecnickcom/tc-lib-pdf-encrypt": "^1.5.6" }, "require-dev": { "apigen/apigen": "^4.1.2", - "bartlett/php-compatinfo": "^5.0.4", - "pdepend/pdepend": "^2.5.0", - "phploc/phploc": "^2.1.5 || ^3.0.1", + "bartlett/php-compatinfo": "^5.0.10 || ^5.0.12", + "pdepend/pdepend": "^2.5.2", + "phploc/phploc": "^2.1 || ^3.0 || ^4.0", "phpmd/phpmd": "^2.6.0", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0", - "sebastian/phpcpd": "^2.0.4 || 3.0.0", - "squizlabs/php_codesniffer": "^2.8.0 || ^3.0.0" + "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.1", + "sebastian/phpcpd": "^2.0 || ^3.0 || ^4.0", + "squizlabs/php_codesniffer": "^2.8.0 || ^3.2.0" }, "autoload": { "psr-4": { diff --git a/php-tecnickcom-tc-lib-pdf-graph.spec b/php-tecnickcom-tc-lib-pdf-graph.spec index 55bdfb6..dcd8939 100644 --- a/php-tecnickcom-tc-lib-pdf-graph.spec +++ b/php-tecnickcom-tc-lib-pdf-graph.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 29f148cf30939edfc05ce25241f70a2ed7b72bd9 +%global gh_commit 0d50fea95597b0fabd459888849149bfffaf9bbb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global c_vendor tecnickcom %global gh_owner tecnickcom @@ -15,7 +15,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_owner}-%{gh_project} -Version: 1.4.5 +Version: 1.4.7 Release: 1%{?dist} Summary: PHP library containing PDF graphic and geometric methods @@ -27,11 +27,23 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit BuildArch: noarch %if %{with_tests} # For tests -BuildRequires: php-composer(phpunit/phpunit) +%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 +%global phpunit %{_bindir}/phpunit7 +%else +%global phpunit %{_bindir}/phpunit +%endif +BuildRequires: %{phpunit} BuildRequires: php(language) >= 5.4 -BuildRequires: php-composer(%{c_vendor}/tc-lib-color) >= 1.12.6 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(%{c_vendor}/tc-lib-color) >= 1.12.1 with php-composer(%{c_vendor}/tc-lib-color) < 2) +BuildRequires: (php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 1.5.2 with php-composer(%{c_vendor}/tc-lib-pdf-encrypt) < 2) +%else +BuildRequires: php-composer(%{c_vendor}/tc-lib-color) < 2 +BuildRequires: php-composer(%{c_vendor}/tc-lib-color) >= 1.12.1 +BuildRequires: php-composer(%{c_vendor}/tc-lib-pdf-encrypt) < 2 BuildRequires: php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 1.5.2 %endif +%endif # From composer.json, "require": { # "php": ">=5.4" @@ -40,10 +52,15 @@ BuildRequires: php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 1.5.2 # "tecnickcom/tc-lib-pdf-encrypt": "^1.4.4" Requires: php(language) >= 5.4 Requires: php-zlib -Requires: php-composer(%{c_vendor}/tc-lib-color) >= 1.12.6 -Requires: php-composer(%{c_vendor}/tc-lib-color) < 2 -Requires: php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 1.5.2 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(%{c_vendor}/tc-lib-color) >= 1.12.6 with php-composer(%{c_vendor}/tc-lib-color) < 2) +Requires: (php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 1.5.2 with php-composer(%{c_vendor}/tc-lib-pdf-encrypt) < 2) +%else +Requires: php-composer(%{c_vendor}/tc-lib-color) < 2 +Requires: php-composer(%{c_vendor}/tc-lib-color) >= 1.12.6 Requires: php-composer(%{c_vendor}/tc-lib-pdf-encrypt) < 2 +Requires: php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 1.5.2 +%endif # From phpcompatinfo report for version 1.4.2 # none @@ -87,10 +104,10 @@ require '%{php_project}/../../Color/autoload.php'; EOF ret=0 -for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do +for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" "php70 %{_bindir}/phpunit6" php71 php72; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit6} --no-coverage --verbose || ret=1 + $1 ${2:-%{_bindir}/phpunit7} --no-coverage --verbose || ret=1 fi done exit $ret @@ -109,6 +126,11 @@ exit $ret %changelog +* Mon May 14 2018 Remi Collet <remi@remirepo.net> - 1.4.7-1 +- update to 1.4.7 (no change) +- switch to phpunit7 +- use range dependencies + * Tue Jan 2 2018 Remi Collet <remi@remirepo.net> - 1.4.5-1 - Update to 1.4.5 (no change) |