From d24703839fe5b886ac13f2fd8a4d47703dae9879 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Sun, 24 Jan 2021 04:18:51 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/perl-JSON.git#b28e17d78f61a6b3b6c8524d81a69b3f16c9ad8b --- perl-JSON.spec | 26 ++++++++++++++++---------- sources | 2 +- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/perl-JSON.spec b/perl-JSON.spec index 7e8adfb..1e1c53c 100644 --- a/perl-JSON.spec +++ b/perl-JSON.spec @@ -1,12 +1,12 @@ Name: perl-JSON Summary: Parse and convert to JSON (JavaScript Object Notation) -Version: 4.02 -Release: 7%{?dist} +Version: 4.03 +Release: 1%{?dist} License: GPL+ or Artistic URL: https://metacpan.org/release/JSON -Source0: https://cpan.metacpan.org/modules/by-module/JSON/JSON-%{version}.tar.gz -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source0: https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/JSON-%{version}.tar.gz +Requires: perl(:MODULE_COMPAT_%(eval "`/usr/bin/perl -V:version`"; echo $version)) Requires: perl(B) Requires: perl(Encode) Requires: perl(Math::BigFloat) @@ -61,21 +61,20 @@ data structure into each other. For JSON, see http://www.crockford.com/JSON/. # make rpmlint happy... find . -type f -exec chmod -c -x {} + -find t/ -type f -exec perl -pi -e 's|^#! perl|#!%{__perl}|' {} + +find t/ -type f -exec perl -pi -e 's|^#! perl|#!/usr/bin/perl|' {} + sed -i 's/\r//' README t/* %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +/usr/bin/perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 +%{make_build} %install -make pure_install DESTDIR=%{buildroot} -find %{buildroot} -type f -name .packlist -delete +%{make_install} %{_fixperms} -c %{buildroot} %check unset PERL_JSON_BACKEND PERL_JSON_DEBUG PERL_JSON_PP_USE_B -make test +%{make_build} test %files %doc Changes README @@ -83,6 +82,13 @@ make test %{_mandir}/man3/* %changelog +* Sun Jan 24 2021 Emmanuel Seyman - 4.03-1 +- Update to 4.03 +- Use %%{make_install} instead of "make pure_install" +- Use %%{make_build} instead of make +- Replace calls to %%{__perl} with /usr/bin/perl +- Pass NO_PACKLIST and NO_PERLLOCAL to Makefile.PL + * Tue Jul 28 2020 Fedora Release Engineering - 4.02-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 0e30f8c..013d427 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (JSON-4.02.tar.gz) = 4af44478cd1dac1755768e5211fe86f0086150157393ff2075def7cf6a394fe11e8e35f369f2abc0470373efc8021e941c59ace9a92dfcd50740f924c747d95a +SHA512 (JSON-4.03.tar.gz) = 5910818d3a866a50ea655da7d9ae617f21d3bc7e8511d35cff96ec4ea04fe553638c7843422cf2d00c37835a6d9f931b1defd224f57c40a3e52d7cef4684ef8c