summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json5
-rw-r--r--php-composer-spdx-licenses.spec14
2 files changed, 10 insertions, 9 deletions
diff --git a/composer.json b/composer.json
index 50b5763..bda5b2b 100644
--- a/composer.json
+++ b/composer.json
@@ -30,11 +30,10 @@
"issues": "https://github.com/composer/spdx-licenses/issues"
},
"require": {
- "php": "^5.3.2 || ^7.0"
+ "php": "^5.3.2 || ^7.0 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
- "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 7"
},
"autoload": {
"psr-4": {
diff --git a/php-composer-spdx-licenses.spec b/php-composer-spdx-licenses.spec
index 096b9c8..e5915fa 100644
--- a/php-composer-spdx-licenses.spec
+++ b/php-composer-spdx-licenses.spec
@@ -1,12 +1,12 @@
# remirepo/fedora spec file for php-composer-spdx-licenses
#
-# Copyright (c) 2015-2018 Remi Collet
+# Copyright (c) 2015-2019 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
-%global gh_commit 7a9556b22bd9d4df7cad89876b00af58ef20d3a2
+%global gh_commit a1aa51cf3ab838b83b0867b14e56fc20fbd55b3d
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20150717
%global gh_owner composer
@@ -15,7 +15,7 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-composer-spdx-licenses
-Version: 1.5.0
+Version: 1.5.1
Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
Summary: SPDX licenses list and validation library
@@ -36,8 +36,7 @@ BuildRequires: php-json
BuildRequires: php-pcre
BuildRequires: php-spl
# From composer.json, "require-dev": {
-# "phpunit/phpunit": "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
-# "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+# "phpunit/phpunit": "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 7",
%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
%global phpunit %{_bindir}/phpunit6
# ignore min version, test suite passes with 6.4
@@ -51,7 +50,7 @@ BuildRequires: php-composer(fedora/autoloader)
%endif
# From composer.json, "require": {
-# "php": "^5.3.2 || ^7.0",
+# "php": "^5.3.2 || ^7.0 || ^8.0",
Requires: php(language) >= 5.3.2
# From phpcompatinfo report for version 1.6.0 (SpdxLicenses.php only)
Requires: php-json
@@ -136,6 +135,9 @@ exit $ret
%changelog
+* Tue Mar 26 2019 Remi Collet <remi@remirepo.net> - 1.5.1-1
+- update to 1.5.1
+
* Fri Nov 2 2018 Remi Collet <remi@remirepo.net> - 1.5.0-1
- update to 1.5.0 (SPDX 3.3)