From 43a73f36ecc34707d5614cee341a2badd0fe7495 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 16 Oct 2017 10:02:03 +0200 Subject: [PATCH] 0.29 bump --- .gitignore | 1 + Config-Perl-V-0.27-Upgrade-to-0.28.patch | 144 ----------------------- perl-Config-Perl-V.spec | 16 +-- sources | 2 +- 4 files changed, 10 insertions(+), 153 deletions(-) delete mode 100644 Config-Perl-V-0.27-Upgrade-to-0.28.patch diff --git a/.gitignore b/.gitignore index 915dc50..5ca3e91 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /Config-Perl-V-0.25.tgz /Config-Perl-V-0.26.tgz /Config-Perl-V-0.27.tgz +/Config-Perl-V-0.29.tgz diff --git a/Config-Perl-V-0.27-Upgrade-to-0.28.patch b/Config-Perl-V-0.27-Upgrade-to-0.28.patch deleted file mode 100644 index 4865115..0000000 --- a/Config-Perl-V-0.27-Upgrade-to-0.28.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 29183497d2d3b99c7aba9792d10ca40bc172dba0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Thu, 11 May 2017 08:59:13 +0200 -Subject: [PATCH] Upgrade to 0.28 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Unbundled from perl-5.25.12. - -Signed-off-by: Petr Písař ---- - V.pm | 24 +++++++++++------------- - t/30_plv5240.t | 11 +++++++++-- - 2 files changed, 20 insertions(+), 15 deletions(-) - -diff --git a/V.pm b/V.pm -index c396f31..9e9c09c 100644 ---- a/V.pm -+++ b/V.pm -@@ -8,8 +8,8 @@ use warnings; - use Config; - use Exporter; - use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS); --$VERSION = "0.27"; --@ISA = ("Exporter"); -+$VERSION = "0.28"; -+@ISA = qw( Exporter ); - @EXPORT_OK = qw( plv2hash summary myconfig signature ); - %EXPORT_TAGS = ( - all => [ @EXPORT_OK ], -@@ -161,7 +161,7 @@ my @config_vars = qw( - useithreads usemultiplicity - useperlio d_sfio uselargefiles usesocks - use64bitint use64bitall uselongdouble -- usemymalloc bincompat5005 -+ usemymalloc default_inc_excludes_dot bincompat5005 - - cc ccflags - optimize -@@ -190,8 +190,7 @@ my %empty_build = ( - patches => [], - ); - --sub _make_derived --{ -+sub _make_derived { - my $conf = shift; - - for ( [ lseektype => "Off_t" ], -@@ -230,11 +229,12 @@ sub _make_derived - $conf->{config}{git_describe} ||= $conf->{config}{perl_patchlevel}; - } - -+ $conf->{config}{$_} ||= "undef" for grep m/^(?:use|def)/ => @config_vars; -+ - $conf; - } # _make_derived - --sub plv2hash --{ -+sub plv2hash { - my %config; - - my $pv = join "\n" => @_; -@@ -308,8 +308,7 @@ sub plv2hash - }); - } # plv2hash - --sub summary --{ -+sub summary { - my $conf = shift || myconfig (); - ref $conf eq "HASH" && - exists $conf->{config} && exists $conf->{build} or return; -@@ -321,14 +320,14 @@ sub summary - d_longdbl d_longlong use64bitall use64bitint useithreads - uselongdouble usemultiplicity usemymalloc useperlio useshrplib - doublesize intsize ivsize nvsize longdblsize longlongsize lseeksize -+ default_inc_excludes_dot - ); - $info{$_}++ for grep { $conf->{build}{options}{$_} } keys %{$conf->{build}{options}}; - - return \%info; - } # summary - --sub signature --{ -+sub signature { - eval { require Digest::MD5 }; - $@ and return "00000000000000000000000000000000"; - -@@ -339,8 +338,7 @@ sub signature - } sort keys %$conf); - } # signature - --sub myconfig --{ -+sub myconfig { - my $args = shift; - my %args = ref $args eq "HASH" ? %$args : - ref $args eq "ARRAY" ? @$args : (); -diff --git a/t/30_plv5240.t b/t/30_plv5240.t -index a730d24..b43b46f 100644 ---- a/t/30_plv5240.t -+++ b/t/30_plv5240.t -@@ -5,7 +5,7 @@ use warnings; - - BEGIN { - use Test::More; -- my $tests = 117; -+ my $tests = 125; - unless ($ENV{PERL_CORE}) { - require Test::NoWarnings; - Test::NoWarnings->import (); -@@ -15,7 +15,7 @@ BEGIN { - plan tests => $tests; - } - --use Config::Perl::V; -+use Config::Perl::V qw( summary ); - - ok (my $conf = Config::Perl::V::plv2hash (), "Read perl -v block"); - ok (exists $conf->{$_}, "Has $_ entry") for qw( build environment config inc ); -@@ -64,9 +64,16 @@ my %check = ( - osvers => "4.5.2-1-default", - use64bitall => "define", - use64bitint => "define", -+ usemymalloc => "n", -+ default_inc_excludes_dot -+ => "undef", - ); - is ($conf->{config}{$_}, $check{$_}, "reconstructed \$Config{$_}") for sort keys %check; - -+ok (my $info = summary ($conf), "A summary"); -+ok (exists $info->{$_}, "Summary has $_") for qw( cc config_args usemymalloc default_inc_excludes_dot ); -+is ($info->{default_inc_excludes_dot}, "undef", "This build has . in INC"); -+ - __END__ - Summary of my perl5 (revision 5 version 24 subversion 0) configuration: - --- -2.9.3 - diff --git a/perl-Config-Perl-V.spec b/perl-Config-Perl-V.spec index 0413dac..8d8333e 100644 --- a/perl-Config-Perl-V.spec +++ b/perl-Config-Perl-V.spec @@ -1,15 +1,13 @@ -%global cpan_version 0.27 +%global cpan_version 0.29 Name: perl-Config-Perl-V -Version: 0.28 -Release: 395%{?dist} +Version: 0.29 +Release: 1%{?dist} Summary: Structured data retrieval of perl -V output License: GPL+ or Artistic URL: http://search.cpan.org/dist/Config-Perl-V/ Source0: http://www.cpan.org/authors/id/H/HM/HMBRAND/Config-Perl-V-%{cpan_version}.tgz -# Unbundled from perl-5.25.12 -Patch0: Config-Perl-V-0.27-Upgrade-to-0.28.patch # Correct example -Patch1: Config-Perl-V-0.24-Remove-invalid-shellbang.patch +Patch0: Config-Perl-V-0.24-Remove-invalid-shellbang.patch BuildArch: noarch BuildRequires: coreutils BuildRequires: make @@ -23,7 +21,7 @@ BuildRequires: perl(Exporter) BuildRequires: perl(vars) BuildRequires: perl(warnings) # Optional run-time: -# Digest::MD5 not used at tests +BuildRequires: perl(Digest::MD5) # Tests: BuildRequires: perl(Test::More) %if !%{defined perl_bootstrap} @@ -43,7 +41,6 @@ module that will return you the output of "perl -V" in a structure. %prep %setup -q -n Config-Perl-V-%{cpan_version} %patch0 -p1 -%patch1 -p1 chmod -x examples/* %build @@ -64,6 +61,9 @@ make test PERL_CORE=%{defined perl_bootstrap} %{_mandir}/man3/* %changelog +* Mon Oct 16 2017 Jitka Plesnikova - 0.29-1 +- 0.29 bump + * Thu Jul 27 2017 Fedora Release Engineering - 0.28-395 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 84c08bb..29755da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9f6396c2487743e74ea1c4fffa4d385c Config-Perl-V-0.27.tgz +SHA512 (Config-Perl-V-0.29.tgz) = a3b641c73647eb0629761a94e23e72e0d13b95fd7a7baa1a04733eb8fe90bb3f73292944d235720504880a3c004ec2837ea740e61cf9ff48bb85669950889d3e