From b8701c54ec67689060b3ee36425c673815e926b3 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Tue, 1 Oct 2019 07:55:20 +0100
Subject: [PATCH] Spec tidy-up

- Use author-independent source URL
- Replace source files filter patch with a less invasive workaround
- Classify buildreqs by usage
- Use %{make_build} and %{make_install}
- Make %files list more explicit
---
 File-Find-Rule-Perl-1.15-fedora.patch | 11 ------
 perl-File-Find-Rule-Perl.spec         | 50 ++++++++++++++++++---------
 2 files changed, 34 insertions(+), 27 deletions(-)
 delete mode 100644 File-Find-Rule-Perl-1.15-fedora.patch

diff --git a/File-Find-Rule-Perl-1.15-fedora.patch b/File-Find-Rule-Perl-1.15-fedora.patch
deleted file mode 100644
index 63ffb5b..0000000
--- a/File-Find-Rule-Perl-1.15-fedora.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- File-Find-Rule-Perl-1.15.orig/t/03_no_index.t	2015-04-05 22:57:10.000000000 +0200
-+++ File-Find-Rule-Perl-1.15/t/03_no_index.t	2015-04-15 12:39:45.612810084 +0200
-@@ -38,6 +38,8 @@
-                         MYMETA.json
- 		};
- 		my @files = sort grep {
-+			! /^(debug|elf).*\.list/
-+			and
- 			! /^debian\b/
- 			and
- 			! /(?:^|\W)\.\w/
diff --git a/perl-File-Find-Rule-Perl.spec b/perl-File-Find-Rule-Perl.spec
index 4058037..0666200 100644
--- a/perl-File-Find-Rule-Perl.spec
+++ b/perl-File-Find-Rule-Perl.spec
@@ -1,51 +1,69 @@
 Name:           perl-File-Find-Rule-Perl
 Version:        1.15
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Common rules for searching for Perl things
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/File-Find-Rule-Perl
-Source0:        https://cpan.metacpan.org/authors/id/E/ET/ETHER/File-Find-Rule-Perl-%{version}.tar.gz
-# Filter out the files rpm generates in sourcedir.
-Patch0:         File-Find-Rule-Perl-1.15-fedora.patch
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Source0:        https://cpan.metacpan.org/modules/by-module/File/File-Find-Rule-Perl-%{version}.tar.gz
 BuildArch:      noarch
+# Module Build
+BuildRequires:  coreutils
+BuildRequires:  make
 BuildRequires:  perl-generators
-BuildRequires:  perl(constant)
-BuildRequires:  perl(lib)
+BuildRequires:  perl-interpreter
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
+# Module Runtime
+BuildRequires:  perl(base)
 BuildRequires:  perl(Carp)
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(constant)
 BuildRequires:  perl(File::Find::Rule) >= 0.20
 BuildRequires:  perl(File::Spec) >= 0.82
-BuildRequires:  perl(File::Spec::Functions)
 BuildRequires:  perl(File::Spec::Unix)
 BuildRequires:  perl(Params::Util) >= 0.38
 BuildRequires:  perl(Parse::CPAN::Meta) >= 1.38
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
+# Test Suite
+BuildRequires:  perl(File::Spec::Functions)
+BuildRequires:  perl(lib)
 BuildRequires:  perl(Test::More) >= 0.47
+# Dependencies
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+
+# noarch, but to avoid debug*.list interfering with no_index test:
+%global debug_package %{nil}
 
 %description
 Common rules for searching for Perl things.
 
 %prep
 %setup -q -n File-Find-Rule-Perl-%{version}
-%patch0 -p1
 
 %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 PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-chmod -R u+w $RPM_BUILD_ROOT/*
+%{make_install}
+%{_fixperms} -c %{buildroot}
 
 %check
 make test
 
 %files
 %doc Changes
-%{perl_vendorlib}/File
-%{_mandir}/man3/*
+%{perl_vendorlib}/File/
+%{_mandir}/man3/File::Find::Rule::Perl.3*
 
 %changelog
+* Tue Oct  1 2019 Paul Howarth <paul@city-fan.org> - 1.15-13
+- Spec tidy-up
+  - Use author-independent source URL
+  - Replace source files filter patch with a less invasive workaround
+  - Classify buildreqs by usage
+  - Use %%{make_build} and %%{make_install}
+  - Make %%files list more explicit
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.15-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild