From 5d5e58bacf403d616dd89d40fde46d1966abfe5e Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 30 Oct 2020 03:00:26 +0100 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-XS.git#9ac2faaaf79101756053b8bbdbd05947dfd26a89 --- .gitignore | 1 + perl-JSON-XS.spec | 21 +++++++++++++-------- sources | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 7114acd..cd32eab 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ JSON-XS-2.27.tar.gz /JSON-XS-4.0.tar.gz /JSON-XS-4.01.tar.gz /JSON-XS-4.02.tar.gz +/JSON-XS-4.03.tar.gz diff --git a/perl-JSON-XS.spec b/perl-JSON-XS.spec index 2fe25d3..6678bb2 100644 --- a/perl-JSON-XS.spec +++ b/perl-JSON-XS.spec @@ -1,8 +1,8 @@ Name: perl-JSON-XS Summary: JSON serializing/de-serializing, done correctly and fast Epoch: 1 -Version: 4.02 -Release: 6%{?dist} +Version: 4.03 +Release: 1%{?dist} License: GPL+ or Artistic URL: https://metacpan.org/release/JSON-XS Source0: https://cpan.metacpan.org/modules/by-module/JSON/JSON-XS-%{version}.tar.gz @@ -53,11 +53,11 @@ perl -pi -e 's|^#!/opt/bin/perl|#!%{__perl}|' eg/* chmod -c -x eg/* %build -%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" NO_PACKLIST=1 -make %{?_smp_mflags} +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" NO_PACKLIST=1 NO_PERLLOCAL=1 +%{make_build} %install -make pure_install DESTDIR=%{buildroot} +%{make_install} %{_fixperms} -c %{buildroot} %check @@ -66,12 +66,17 @@ make test %files %doc Changes README eg/ %license COPYING -%{perl_vendorarch}/* -%exclude %dir %{perl_vendorarch}/auto -%{_bindir}/* +%{_bindir}/json_xs +%{perl_vendorarch}/auto/JSON/ +%{perl_vendorarch}/JSON/ %{_mandir}/man[13]/* %changelog +* Wed Oct 28 2020 Paul Howarth - 1:4.03-1 +- Update to 4.03 +- Use %%{make_build} and %%{make_install} +- Simplify files list a bit + * Tue Jul 28 2020 Fedora Release Engineering - 1:4.02-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 2459897..0bf89bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (JSON-XS-4.02.tar.gz) = 4a8fdf8d81cdd6e38c3c5672621d38ef6f63a09ca3a74e98fbb21e679273c347d2a3b8c2233c8e813987d2728081fb535223ea3f705d33a7016b76d0e76ffd61 +SHA512 (JSON-XS-4.03.tar.gz) = 7d2c20302b0f98bd69e692b61d272b58c13a79741f3e2e44ee0530e21dd239526477f8b02e4afbfe41ee83cb69ab1c5247bf0be355f3f09e9cfe31b2ea4a5155