From e36aeb5ea9835babc4dcd292dd11ff4d66e28ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 2 Jul 2018 16:05:41 +0200 Subject: [PATCH] 0.10014 bump --- .gitignore | 1 + ...-building-on-Perl-without-dot-in-INC.patch | 8 -- perl-Class-Accessor-Grouped.rpmlintrc | 2 + perl-Class-Accessor-Grouped.spec | 79 ++++++++++++------- sources | 2 +- 5 files changed, 53 insertions(+), 39 deletions(-) delete mode 100644 Class-Accessor-Grouped-0.10012-Fix-building-on-Perl-without-dot-in-INC.patch create mode 100644 perl-Class-Accessor-Grouped.rpmlintrc diff --git a/.gitignore b/.gitignore index e9e906c..ba1dadd 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ Class-Accessor-Grouped-0.09002.tar.gz /Class-Accessor-Grouped-0.10009.tar.gz /Class-Accessor-Grouped-0.10010.tar.gz /Class-Accessor-Grouped-0.10012.tar.gz +/Class-Accessor-Grouped-0.10014.tar.gz diff --git a/Class-Accessor-Grouped-0.10012-Fix-building-on-Perl-without-dot-in-INC.patch b/Class-Accessor-Grouped-0.10012-Fix-building-on-Perl-without-dot-in-INC.patch deleted file mode 100644 index 28ad9d1..0000000 --- a/Class-Accessor-Grouped-0.10012-Fix-building-on-Perl-without-dot-in-INC.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -up Class-Accessor-Grouped-0.10012/Makefile.PL.orig Class-Accessor-Grouped-0.10012/Makefile.PL ---- Class-Accessor-Grouped-0.10012/Makefile.PL.orig 2017-05-18 09:25:41.469477083 +0200 -+++ Class-Accessor-Grouped-0.10012/Makefile.PL 2017-05-18 09:25:56.364483645 +0200 -@@ -1,3 +1,4 @@ -+BEGIN { push @INC, '.'; } - use strict; - use warnings; - use inc::Module::Install 1.06; diff --git a/perl-Class-Accessor-Grouped.rpmlintrc b/perl-Class-Accessor-Grouped.rpmlintrc new file mode 100644 index 0000000..09e67aa --- /dev/null +++ b/perl-Class-Accessor-Grouped.rpmlintrc @@ -0,0 +1,2 @@ +from Config import * +addFilter("spelling-error .* (accessors|getters)"); diff --git a/perl-Class-Accessor-Grouped.spec b/perl-Class-Accessor-Grouped.spec index 63aeacd..1d3e42c 100644 --- a/perl-Class-Accessor-Grouped.spec +++ b/perl-Class-Accessor-Grouped.spec @@ -1,53 +1,68 @@ +# Use optional Class::XSAccessor +%bcond_without perl_Class_Accessor_Grouped_enables_Class_XSAccessor +# Run optional test +%bcond_without perl_Class_Accessor_Grouped_enables_optional_test +# Support arbitrary method names using Sub::Name +%bcond_without perl_Class_Accessor_Grouped_enables_Sub_Name + Name: perl-Class-Accessor-Grouped -Version: 0.10012 -Release: 11%{?dist} +Version: 0.10014 +Release: 1%{?dist} Summary: Build groups of accessors License: GPL+ or Artistic -Group: Development/Libraries URL: https://metacpan.org/release/Class-Accessor-Grouped -Source0: https://cpan.metacpan.org/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-%{version}.tar.gz -Patch0: Class-Accessor-Grouped-0.10012-Fix-building-on-Perl-without-dot-in-INC.patch +Source0: https://cpan.metacpan.org/authors/id/H/HA/HAARG/Class-Accessor-Grouped-%{version}.tar.gz BuildArch: noarch # Build -BuildRequires: findutils +BuildRequires: coreutils BuildRequires: make -BuildRequires: perl-interpreter BuildRequires: perl-generators -BuildRequires: perl(Config) -BuildRequires: perl(CPAN) -BuildRequires: perl(Cwd) -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(ExtUtils::MM_Unix) -BuildRequires: perl(Fcntl) -BuildRequires: perl(File::Find) -BuildRequires: perl(File::Path) -BuildRequires: perl(File::Spec) +BuildRequires: perl-interpreter +BuildRequires: perl(:VERSION) >= 5.6 +BuildRequires: perl(ExtUtils::HasCompiler) +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 +BuildRequires: perl(lib) BuildRequires: perl(strict) -BuildRequires: perl(vars) +BuildRequires: perl(Text::ParseWords) BuildRequires: perl(warnings) -# Runtime +BuildRequires: sed +# Run-time: BuildRequires: perl(Carp) BuildRequires: perl(constant) -BuildRequires: perl(Module::Runtime) +BuildRequires: perl(Module::Runtime) >= 0.012 BuildRequires: perl(mro) BuildRequires: perl(Scalar::Util) -# Tests only +# Optional run-time: +%if %{with perl_Class_Accessor_Grouped_enables_Sub_Name} +BuildRequires: perl(Sub::Name) >= 0.05 +%endif +%if %{with perl_Class_Accessor_Grouped_enables_Class_XSAccessor} +BuildRequires: perl(Class::XSAccessor) >= 1.19 +%endif +# Tests BuildRequires: perl(base) -BuildRequires: perl(Class::XSAccessor) BuildRequires: perl(Data::Dumper) +%if %{with perl_Class_Accessor_Grouped_enables_Sub_Name} BuildRequires: perl(Devel::Hide) -BuildRequires: perl(File::Basename) +%endif BuildRequires: perl(File::Spec::Functions) BuildRequires: perl(File::Spec::Unix) BuildRequires: perl(FindBin) -BuildRequires: perl(lib) -BuildRequires: perl(Package::Stash) -BuildRequires: perl(Sub::Name) BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::More) +%if %{with perl_Class_Accessor_Grouped_enables_optional_test} +# Optional tests: +# MRO::Compat not used on Perl >= 5.9.5 +BuildRequires: perl(Package::Stash) +%endif Requires: perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version)) -Requires: perl(Class::XSAccessor) >= 1.19 -Requires: perl(Sub::Name) >= 0.05 +%if %{with perl_Class_Accessor_Grouped_enables_Class_XSAccessor} +Recommends: perl(Class::XSAccessor) >= 1.19 +%endif +Requires: perl(mro) +%if %{with perl_Class_Accessor_Grouped_enables_Sub_Name} +Recommends: perl(Sub::Name) >= 0.05 +%endif %{?perl_default_filter} @@ -57,15 +72,16 @@ getters and setters. %prep %setup -q -n Class-Accessor-Grouped-%{version} -%patch0 -p1 +# Remove bundled modules +rm -r inc +sed -i -e '/^inc\//d' MANIFEST %build -perl Makefile.PL INSTALLDIRS=vendor +perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 make %{?_smp_mflags} %install make pure_install DESTDIR=%{buildroot} -find %{buildroot} -type f -name .packlist -delete %{_fixperms} %{buildroot}/* %check @@ -77,6 +93,9 @@ make test %{_mandir}/man3/* %changelog +* Mon Jul 02 2018 Petr Pisar - 0.10014-1 +- 0.10014 bump + * Fri Jun 29 2018 Jitka Plesnikova - 0.10012-11 - Perl 5.28 rebuild diff --git a/sources b/sources index 4406c88..fefdc4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd9fad3112c315d60b5fca5b17e98996 Class-Accessor-Grouped-0.10012.tar.gz +SHA512 (Class-Accessor-Grouped-0.10014.tar.gz) = d69fe27c3a12845bb4d0abe6c73d1a82eaf550821184f0945c3802e3932c7742e04c6f655e550386923c2a005e7f893f44ed950c56e6e80785b5a23e7b3c80b3