update to 1.6.0

drop patch merged upstream

(cherry picked from commit 63841b8058)
(cherry picked from commit 14b69ae56a)

.gitignore

@@ -1 +1,4 @@
 /php-netresearch-jsonmapper-1.4.0-3868fe1.tgz
+/php-netresearch-jsonmapper-1.5.0-da74a07.tgz
+/php-netresearch-jsonmapper-1.5.1-047dafe.tgz
+/php-netresearch-jsonmapper-1.6.0-0d4d1b4.tgz

php-netresearch-jsonmapper.spec

@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    3868fe1128ce1169228acdb623359dca74db5ef3
+%global gh_commit    0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     cweiske
 %global gh_project   jsonmapper
@@ -18,7 +18,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{pk_vendor}-%{pk_project}
-Version:        1.4.0
+Version:        1.6.0
 Release:        1%{?dist}
 Summary:        Map nested JSON structures onto PHP classes
 
@@ -32,8 +32,10 @@ BuildArch:      noarch
 %if %{with_tests}
 # For tests
 BuildRequires:  php(language) >= 5.6
-BuildRequires:  php-pcre
 BuildRequires:  php-spl
+BuildRequires:  php-json
+BuildRequires:  php-pcre
+BuildRequires:  php-reflection
 # From composer.json, "require-dev": {
 #        "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4",
 #        "squizlabs/php_codesniffer": "~1.5"
@@ -49,11 +51,18 @@ BuildRequires:  php-fedora-autoloader-devel
 %endif
 
 # From composer.json, "require": {
-#      "php": ">=5.6"
+#        "php": ">=5.6",
+#        "ext-spl": "*",
+#        "ext-json": "*",
+#        "ext-pcre": "*",
+#        "ext-reflection": "*"
 Requires:       php(language) >= 5.6
-# From phpcompatinfo report for version 1.3.0
-Requires:       php-pcre
 Requires:       php-spl
+Requires:       php-json
+Requires:       php-pcre
+Requires:       php-reflection
+# From phpcompatinfo report for version 1.6.0
+# none
 # Required by autoloader
 Requires:       php-composer(fedora/autoloader)
 
@@ -99,7 +108,7 @@ mkdir vendor
 
 : Run upstream test suite
 ret=0
-for cmd in "php %{phpunit}" php70 php71 php72 php73; do
+for cmd in "php %{phpunit}" php71 php72 php73 php74; do
   if which $cmd; then
     set $cmd
     $1 ${2:-%{_bindir}/phpunit6} \
@@ -124,6 +133,16 @@ exit $ret
 
 
 %changelog
+* Mon Aug 19 2019 Remi Collet <remi@remirepo.net> - 1.6.0-1
+- update to 1.6.0
+- drop patch merged upstream
+
+* Tue Jul  9 2019 Remi Collet <remi@remirepo.net> - 1.5.1-1
+- update to 1.5.1
+
+* Mon Jul  8 2019 Remi Collet <remi@remirepo.net> - 1.5.0-1
+- update to 1.5.0
+
 * Mon Jan 22 2018 Remi Collet <remi@remirepo.net> - 1.4.0-1
 - Update to 1.4.0
 - use phpunit6 on F26+

sources

@@ -1 +1 @@
-SHA512 (php-netresearch-jsonmapper-1.4.0-3868fe1.tgz) = ac35b409c902206f05a3817d70fafc93e88d180f255beaed493bfc434552f1148257be521a8510caf90ed6d370bbc5eed928a4be934caa4f0d4e0c184f89fe6e
+SHA512 (php-netresearch-jsonmapper-1.6.0-0d4d1b4.tgz) = dc5763369b150f5a8378e84892eb1795fd899f83612ff989213b3fdc70cdd53e8836013133f4242e519eb16911872449cfbb08f5e951f1cb73f33c03694b4614