From 325ce0e3a64a44a5485c321602b7204a282ab98d Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Tue, 21 Nov 2017 14:49:43 +0000 Subject: [PATCH] Update to 2.97 - New upstream release 2.97 - Fix is_bool to use blessed() instead of ref() - Use 5 digit minor version number for a while to avoid confusion (GH#33) - Stick to 2 digit minor version downstream as we already bumped epoch --- perl-JSON-PP.spec | 20 +++++++++++++------- sources | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/perl-JSON-PP.spec b/perl-JSON-PP.spec index c524489..567e224 100644 --- a/perl-JSON-PP.spec +++ b/perl-JSON-PP.spec @@ -1,19 +1,19 @@ # Need to provide five digit version numbers until 3.x, # so that BR: perl(JSON::PP) >= 2.27200 etc. will still work -%global cpan_version 2.96 -%global five_digit_version %(LC_ALL=C; printf '%.5f' '%{cpan_version}') +%global our_version 2.97 +%global five_digit_version %(LC_ALL=C; printf '%.5f' '%{our_version}') # Need to tweak provides differently if we don't have rpm ≥ 4.9 %global rpm49 %(rpm --version | perl -p -e 's/^.* (\\d+)\\.(\\d+).*/sprintf("%d.%03d",$1,$2) ge 4.009 ? 1 : 0/e' 2>/dev/null || echo 0) Name: perl-JSON-PP Epoch: 1 -Version: %{cpan_version} +Version: %{our_version} Release: 1%{?dist} Summary: JSON::XS compatible pure-Perl module License: GPL+ or Artistic URL: http://search.cpan.org/dist/JSON-PP/ -Source0: http://search.cpan.org/CPAN/authors/id/I/IS/ISHIGAKI/JSON-PP-%{cpan_version}.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/I/IS/ISHIGAKI/JSON-PP-%{five_digit_version}.tar.gz BuildArch: noarch # Module Build BuildRequires: coreutils @@ -59,7 +59,7 @@ Requires: perl(utf8) Conflicts: perl-JSON < 2.50 # Provide the five-digit version of the module -%if "%{cpan_version}" != "%{five_digit_version}" +%if "%{our_version}" != "%{five_digit_version}" Provides: perl(JSON::PP) = %{five_digit_version} %global __provides_exclude ^perl\\(JSON::PP\\) %endif @@ -71,11 +71,11 @@ Marc Lehmann in C, so must be compiled and installed in the used environment. JSON::PP is a pure-Perl module and is compatible with JSON::XS. %prep -%setup -q -n JSON-PP-%{cpan_version} +%setup -q -n JSON-PP-%{five_digit_version} # Don't provide less than five-digit version of the module (prior to rpm 4.9) %if ! %{rpm49} -%if "%{cpan_version}" != "%{five_digit_version}" +%if "%{our_version}" != "%{five_digit_version}" %global perl_prov /bin/sh -c "%{__perl_provides} | sed -e '/^perl(JSON::PP)/d'" %global __perl_provides %{perl_prov} %endif @@ -102,6 +102,12 @@ make test %{_mandir}/man3/JSON::PP::Boolean.3* %changelog +* Tue Nov 21 2017 Paul Howarth - 1:2.97-1 +- Update to 2.97 + - Fix is_bool to use blessed() instead of ref() + - Use 5 digit minor version number for a while to avoid confusion (GH#33) +- Stick to 2 digit minor version downstream as we already bumped epoch + * Mon Nov 20 2017 Paul Howarth - 1:2.96-1 - Update to 2.96 - json_pp now prints an encoded json string (CPAN RT#123653) diff --git a/sources b/sources index 4faacae..b704526 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (JSON-PP-2.96.tar.gz) = 3fc8c3c9a4159d841d685c20f5c57d3b1c23a35729ea8355485baf62c83bbc26072749cb5733f0b3a206c34e2129b094dc8a55c2bcecd4af1b5a6f5ba7ab5257 +SHA512 (JSON-PP-2.97000.tar.gz) = df79d8c6f3bd08e731979f53c35f7e3e20ffe1ec9cffe6587d7c75cc4e5aabf10578ac19f0336e7f2394bff6c331adb111981f908098962a86f66ae9ccd0121a