ppisar pushed to perl-Catalyst-Plugin-Unicode (master). "Fix building on Perl without "." in @INC (..more)"

From 60d1120f26934dab0005b29aaf0faeb8dfb17e7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com&gt;
Date: Thu, 25 May 2017 11:53:56 +0200
Subject: Fix building on Perl without "." in @INC

This is implemented by unbundling ./inc modules. Also dependency list
was corrected and spec file modernized.
---
 perl-Catalyst-Plugin-Unicode.spec | 55 ++++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/perl-Catalyst-Plugin-Unicode.spec b/perl-Catalyst-Plugin-Unicode.spec
index 2872055..4cbfbad 100644
--- a/perl-Catalyst-Plugin-Unicode.spec
+++ b/perl-Catalyst-Plugin-Unicode.spec
@@ -1,26 +1,49 @@
 Name:           perl-Catalyst-Plugin-Unicode
 Version:        0.93
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Unicode aware Catalyst
 License:        GPL+ or Artistic
-Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Catalyst-Plugin-Unicode/
 Source0:       
http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Unic...
 # Define POD encoding, CPAN RT#87666
 Patch0:         Catalyst-Plugin-Unicode-0.93-Define-POD-encoding.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  coreutils
+BuildRequires:  make
+BuildRequires:  perl
 BuildRequires:  perl-generators
+BuildRequires:  perl(inc::Module::Install) >= 0.87
+BuildRequires:  perl(Module::Install::AutoInstall)
+BuildRequires:  perl(Module::Install::Metadata)
+BuildRequires:  perl(Module::Install::WriteAll)
+BuildRequires:  sed
+# Run-time:
+# This is a Catalyst plugin
 BuildRequires:  perl(Catalyst::Runtime) >= 5.70
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(IO::Scalar)
 BuildRequires:  perl(MRO::Compat)
+BuildRequires:  perl(strict)
+# Tests:
+BuildRequires:  perl(base)
+BuildRequires:  perl(Catalyst)
+BuildRequires:  perl(Catalyst::Controller)
+# Catalyst::Engine::HTTP not used
+# Catalyst::Test not used
+BuildRequires:  perl(FindBin)
+# Getopt::Long not used
+BuildRequires:  perl(IO::Scalar)
+BuildRequires:  perl(lib)
 BuildRequires:  perl(ok)
+# Pod::Usage not used
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::WWW::Mechanize::Catalyst)
-BuildRequires:  perl(Test::Pod)
-BuildRequires:  perl(Test::Pod::Coverage)
+BuildRequires:  perl(utf8)
+BuildRequires:  perl(warnings)
+# Optional tests
+BuildRequires:  perl(Test::Pod) >= 1.14
+BuildRequires:  perl(Test::Pod::Coverage) >= 1.04
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo
$version))
+# This is a Catalyst plugin
+Requires:       perl(Catalyst::Runtime) >= 5.70
 
 %{?perl_default_filter}
 
@@ -31,34 +54,30 @@ characters. On response, encodes body into UTF-8 octets.
 %prep
 %setup -q -n Catalyst-Plugin-Unicode-%{version}
 %patch0 -p1
+# Remove bundled modules
+rm -r ./inc/*
+sed -i -e '/^inc\//d' MANIFEST
 
 %build
-PERL5_CPANPLUS_IS_RUNNING=1 %{__perl} Makefile.PL INSTALLDIRS=vendor
+PERL5_CPANPLUS_IS_RUNNING=1 %{__perl} Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make pure_install DESTDIR=$RPM_BUILD_ROOT
-
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 TEST_POD=1 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc Changes
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Thu May 25 2017 Petr Pisar <ppisar(a)redhat.com&gt; - 0.93-19
+- Fix building on Perl without "." in @INC (CPAN RT#121881)
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org&gt; - 0.93-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
-- 
cgit v1.1


	https://src.fedoraproject.org/cgit/perl-Catalyst-Plugin-Unicode.git/commi...