diff --git a/perl-Hash-Merge.spec b/perl-Hash-Merge.spec index c6ec1e1..e7d87a9 100644 --- a/perl-Hash-Merge.spec +++ b/perl-Hash-Merge.spec @@ -1,12 +1,13 @@ Name: perl-Hash-Merge Version: 0.300 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Merges arbitrary deep hashes into a single hash License: GPL+ or Artistic URL: https://metacpan.org/release/Hash-Merge -Source0: https://cpan.metacpan.org/authors/id/R/RE/REHSACK/Hash-Merge-%{version}.tar.gz +Source0: https://cpan.metacpan.org/modules/by-module/Hash/Hash-Merge-%{version}.tar.gz BuildArch: noarch - +# Build +BuildRequires: coreutils BuildRequires: make BuildRequires: perl-generators BuildRequires: perl-interpreter @@ -27,11 +28,10 @@ BuildRequires: perl(Test::More) # Optional tests BuildRequires: perl(Clone::PP) BuildRequires: perl(Storable) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# Dependencies +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) # required but not detected automatically -Requires: perl(Clone) - -%{?perl_default_filter} +Requires: perl(Clone) %description %{summary}. @@ -40,13 +40,12 @@ Requires: perl(Clone) %setup -q -n Hash-Merge-%{version} %build -%{__perl} Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 -make %{?_smp_mflags} +perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 +%{make_build} %install -make pure_install DESTDIR=%{buildroot} -chmod -x %{buildroot}%{perl_vendorlib}/Hash/Merge.pm -%{_fixperms} %{buildroot}/* +%{make_install} +%{_fixperms} -c %{buildroot} %check make test @@ -54,10 +53,17 @@ make test %files %doc Changes README.md %{perl_vendorlib}/Hash/ -%{_mandir}/man3/*.3* - +%{_mandir}/man3/Hash::Merge.3* %changelog +* Fri Oct 25 2019 Paul Howarth - 0.300-8 +- Spec tidy-up + - Use author-independent source URL + - Drop redundant use of %%{?perl_default_filter} + - Use %%{make_build} and %%{make_install} + - Fix permissions verbosely + - Make %%files list more explicit + * Fri Jul 26 2019 Fedora Release Engineering - 0.300-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild