From d42049494a8db2bd49c10ee25b3e159beef6551c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 8 Jul 2019 10:37:47 +0200 Subject: [PATCH 1/3] v1.5.0 (cherry picked from commit 8abf4e483b0d51cf5f772ea34aa40f2e2cc3c8b4) --- .gitignore | 1 + php-netresearch-jsonmapper.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1d8e89c..b59a9f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /php-netresearch-jsonmapper-1.4.0-3868fe1.tgz +/php-netresearch-jsonmapper-1.5.0-da74a07.tgz diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index f90701d..ec0f660 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 3868fe1128ce1169228acdb623359dca74db5ef3 +%global gh_commit da74a078d23b84134bed666df1e484d39e4f410d %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.5.0 Release: 1%{?dist} Summary: Map nested JSON structures onto PHP classes @@ -99,7 +99,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 +124,9 @@ exit $ret %changelog +* Mon Jul 8 2019 Remi Collet - 1.5.0-1 +- update to 1.5.0 + * Mon Jan 22 2018 Remi Collet - 1.4.0-1 - Update to 1.4.0 - use phpunit6 on F26+ diff --git a/sources b/sources index 4675eb1..3870b50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-netresearch-jsonmapper-1.4.0-3868fe1.tgz) = ac35b409c902206f05a3817d70fafc93e88d180f255beaed493bfc434552f1148257be521a8510caf90ed6d370bbc5eed928a4be934caa4f0d4e0c184f89fe6e +SHA512 (php-netresearch-jsonmapper-1.5.0-da74a07.tgz) = a4edd48a45053f2886355b58fcde7df24ad3d6165928dfc5c6c5c993a243f87d6399ffd337d7ae6c37384f510ea27236bf52feae2c6626663d93b8b1fdff2204 From 2740b556ddff91e888e5cc4a75f97f78fecc8bb2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 9 Jul 2019 06:53:50 +0200 Subject: [PATCH 2/3] v1.5.1 (cherry picked from commit 6240610f1371be453f9f50bd49c9ed6bcd5b69cc) (cherry picked from commit 57196ff10930cae1d5e1af868b508520a17cc26b) --- .gitignore | 1 + php-netresearch-jsonmapper.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b59a9f5..713905e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /php-netresearch-jsonmapper-1.4.0-3868fe1.tgz /php-netresearch-jsonmapper-1.5.0-da74a07.tgz +/php-netresearch-jsonmapper-1.5.1-047dafe.tgz diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index ec0f660..3213b2b 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit da74a078d23b84134bed666df1e484d39e4f410d +%global gh_commit 047dafe26facbba1e997e9fb3b3c298562d75a0b %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.5.0 +Version: 1.5.1 Release: 1%{?dist} Summary: Map nested JSON structures onto PHP classes @@ -124,6 +124,9 @@ exit $ret %changelog +* Tue Jul 9 2019 Remi Collet - 1.5.1-1 +- update to 1.5.1 + * Mon Jul 8 2019 Remi Collet - 1.5.0-1 - update to 1.5.0 diff --git a/sources b/sources index 3870b50..950fba4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-netresearch-jsonmapper-1.5.0-da74a07.tgz) = a4edd48a45053f2886355b58fcde7df24ad3d6165928dfc5c6c5c993a243f87d6399ffd337d7ae6c37384f510ea27236bf52feae2c6626663d93b8b1fdff2204 +SHA512 (php-netresearch-jsonmapper-1.5.1-047dafe.tgz) = c368fc765ac795eb1ac57f3f228f4ce686efc3eccd31dae33c3c2204a941e87d2a374dadaffc8f56f6bb04b3f87ab2b2210149a51c06635b7eb306b0f5341dfd From 00c6131f1bc90ae949310322aff9a2a5c476eee4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 19 Aug 2019 14:10:53 +0200 Subject: [PATCH 3/3] update to 1.6.0 drop patch merged upstream (cherry picked from commit 63841b805888381de7aa8aacfe21d69fe5d51d50) (cherry picked from commit 14b69ae56a14068603b27b970bfe637a19fb68c8) --- .gitignore | 1 + php-netresearch-jsonmapper.spec | 25 +++++++++++++++++++------ sources | 2 +- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 713905e..1b29059 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +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 diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index 3213b2b..01442a8 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 047dafe26facbba1e997e9fb3b3c298562d75a0b +%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.5.1 +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) @@ -124,6 +133,10 @@ exit $ret %changelog +* Mon Aug 19 2019 Remi Collet - 1.6.0-1 +- update to 1.6.0 +- drop patch merged upstream + * Tue Jul 9 2019 Remi Collet - 1.5.1-1 - update to 1.5.1 diff --git a/sources b/sources index 950fba4..48bea0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-netresearch-jsonmapper-1.5.1-047dafe.tgz) = c368fc765ac795eb1ac57f3f228f4ce686efc3eccd31dae33c3c2204a941e87d2a374dadaffc8f56f6bb04b3f87ab2b2210149a51c06635b7eb306b0f5341dfd +SHA512 (php-netresearch-jsonmapper-1.6.0-0d4d1b4.tgz) = dc5763369b150f5a8378e84892eb1795fd899f83612ff989213b3fdc70cdd53e8836013133f4242e519eb16911872449cfbb08f5e951f1cb73f33c03694b4614