Hello community,
here is the log from the commit of package perl-ExtUtils-MakeMaker-CPANfile for
openSUSE:Factory checked in at 2017-06-26 15:56:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-ExtUtils-MakeMaker-CPANfile (Old)
and /work/SRC/openSUSE:Factory/.perl-ExtUtils-MakeMaker-CPANfile.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-ExtUtils-MakeMaker-CPANfile"
Mon Jun 26 15:56:36 2017 rev:3 rq:506088 version:0.08
Changes:
--------
---
/work/SRC/openSUSE:Factory/perl-ExtUtils-MakeMaker-CPANfile/perl-ExtUtils-MakeMaker-CPANfile.changes
2015-12-16 17:42:25.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.perl-ExtUtils-MakeMaker-CPANfile.new/perl-ExtUtils-MakeMaker-CPANfile.changes
2017-06-26 15:56:40.226373219 +0200
@@ -1,0 +2,10 @@
+Wed Jun 21 05:36:40 UTC 2017 - [email protected]
+
+- updated to 0.08
+ see /usr/share/doc/packages/perl-ExtUtils-MakeMaker-CPANfile/Changes
+
+ 0.08 2017/06/18
+ - fixed to convert META_ADD/MERGE properly when 2.0 elements
+ are found (RT-122124)
+
+-------------------------------------------------------------------
Old:
----
ExtUtils-MakeMaker-CPANfile-0.07.tar.gz
New:
----
ExtUtils-MakeMaker-CPANfile-0.08.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-ExtUtils-MakeMaker-CPANfile.spec ++++++
--- /var/tmp/diff_new_pack.NS5n4f/_old 2017-06-26 15:56:41.282224307 +0200
+++ /var/tmp/diff_new_pack.NS5n4f/_new 2017-06-26 15:56:41.286223743 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-ExtUtils-MakeMaker-CPANfile
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,22 +17,24 @@
Name: perl-ExtUtils-MakeMaker-CPANfile
-Version: 0.07
+Version: 0.08
Release: 0
%define cpan_name ExtUtils-MakeMaker-CPANfile
Summary: Cpanfile Support for Eumm
License: Artistic-1.0 or GPL-1.0+
Group: Development/Libraries/Perl
Url: http://search.cpan.org/dist/ExtUtils-MakeMaker-CPANfile/
-Source0:
http://www.cpan.org/authors/id/I/IS/ISHIGAKI/%{cpan_name}-%{version}.tar.gz
+Source0:
https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/%{cpan_name}-%{version}.tar.gz
Source1: cpanspec.yml
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
+BuildRequires: perl(CPAN::Meta::Converter) >= 2.141170
BuildRequires: perl(Module::CPANfile)
BuildRequires: perl(Test::More) >= 0.88
BuildRequires: perl(version) >= 0.76
+Requires: perl(CPAN::Meta::Converter) >= 2.141170
Requires: perl(Module::CPANfile)
Requires: perl(Test::More) >= 0.88
Requires: perl(version) >= 0.76
@@ -65,6 +67,7 @@
%files -f %{name}.files
%defattr(-,root,root,755)
-%doc Changes LICENSE README.md
+%doc Changes README.md
+%license LICENSE
%changelog
++++++ ExtUtils-MakeMaker-CPANfile-0.07.tar.gz ->
ExtUtils-MakeMaker-CPANfile-0.08.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ExtUtils-MakeMaker-CPANfile-0.07/Changes
new/ExtUtils-MakeMaker-CPANfile-0.08/Changes
--- old/ExtUtils-MakeMaker-CPANfile-0.07/Changes 2015-12-09
15:20:08.000000000 +0100
+++ new/ExtUtils-MakeMaker-CPANfile-0.08/Changes 2017-06-18
04:47:02.000000000 +0200
@@ -1,5 +1,9 @@
Revision history for Perl extension ExtUtils-MakeMaker-CPANfile
+0.08 2017/06/18
+ - fixed to convert META_ADD/MERGE properly when 2.0 elements
+ are found (RT-122124)
+
0.07 2015/12/09
- supported recommends, suggests, conflicts
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ExtUtils-MakeMaker-CPANfile-0.07/META.json
new/ExtUtils-MakeMaker-CPANfile-0.08/META.json
--- old/ExtUtils-MakeMaker-CPANfile-0.07/META.json 2015-12-09
15:20:58.000000000 +0100
+++ new/ExtUtils-MakeMaker-CPANfile-0.08/META.json 2017-06-18
04:47:16.000000000 +0200
@@ -4,13 +4,13 @@
"Kenichi Ishigaki <[email protected]>"
],
"dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter
version 2.143240",
+ "generated_by" : "ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter
version 2.143240",
"license" : [
"perl_5"
],
"meta-spec" : {
"url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";,
- "version" : "2"
+ "version" : 2
},
"name" : "ExtUtils-MakeMaker-CPANfile",
"no_index" : {
@@ -32,6 +32,7 @@
},
"runtime" : {
"requires" : {
+ "CPAN::Meta::Converter" : "2.141170",
"Cwd" : "0",
"ExtUtils::MakeMaker" : "6.17",
"File::Path" : "0",
@@ -47,5 +48,5 @@
"url" : "https://github.com/charsbar/ExtUtils-MakeMaker-CPANfile";
}
},
- "version" : "0.07"
+ "version" : "0.08"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ExtUtils-MakeMaker-CPANfile-0.07/META.yml
new/ExtUtils-MakeMaker-CPANfile-0.08/META.yml
--- old/ExtUtils-MakeMaker-CPANfile-0.07/META.yml 2015-12-09
15:20:58.000000000 +0100
+++ new/ExtUtils-MakeMaker-CPANfile-0.08/META.yml 2017-06-18
04:47:16.000000000 +0200
@@ -7,7 +7,7 @@
configure_requires:
ExtUtils::MakeMaker: '0'
dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version
2.143240'
+generated_by: 'ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version
2.143240'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -18,6 +18,7 @@
- t
- inc
requires:
+ CPAN::Meta::Converter: '2.141170'
Cwd: '0'
ExtUtils::MakeMaker: '6.17'
File::Path: '0'
@@ -26,4 +27,4 @@
version: '0.76'
resources:
repository: https://github.com/charsbar/ExtUtils-MakeMaker-CPANfile
-version: '0.07'
+version: '0.08'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ExtUtils-MakeMaker-CPANfile-0.07/Makefile.PL
new/ExtUtils-MakeMaker-CPANfile-0.08/Makefile.PL
--- old/ExtUtils-MakeMaker-CPANfile-0.07/Makefile.PL 2013-09-22
10:59:52.000000000 +0200
+++ new/ExtUtils-MakeMaker-CPANfile-0.08/Makefile.PL 2017-06-18
04:42:55.000000000 +0200
@@ -13,6 +13,7 @@
'Cwd' => '0',
'File::Path' => '0',
'Module::CPANfile' => '0',
+ 'CPAN::Meta::Converter' => '2.141170',
'Test::More' => '0.88',
'version' => '0.76',
},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ExtUtils-MakeMaker-CPANfile-0.07/lib/ExtUtils/MakeMaker/CPANfile.pm
new/ExtUtils-MakeMaker-CPANfile-0.08/lib/ExtUtils/MakeMaker/CPANfile.pm
--- old/ExtUtils-MakeMaker-CPANfile-0.07/lib/ExtUtils/MakeMaker/CPANfile.pm
2015-12-09 15:19:15.000000000 +0100
+++ new/ExtUtils-MakeMaker-CPANfile-0.08/lib/ExtUtils/MakeMaker/CPANfile.pm
2017-06-18 04:43:05.000000000 +0200
@@ -7,7 +7,7 @@
use Module::CPANfile;
use version;
-our $VERSION = "0.07";
+our $VERSION = "0.08";
sub import {
my $class = shift;
@@ -81,7 +81,29 @@
}
}
if ($requires_2_0) { # for better recommends support
- $params{META_MERGE}{"meta-spec"} ||= {version => 2};
+ # stash prereqs, which is already converted
+ my $tmp_prereqs = delete $params{META_MERGE}{prereqs};
+
+ require CPAN::Meta::Converter;
+ for my $key (qw/META_ADD META_MERGE/) {
+ next unless %{$params{$key} || {}};
+ my $converter = CPAN::Meta::Converter->new($params{$key},
default_version => 1.4);
+ $params{$key} = $converter->upgrade_fragment;
+ }
+
+ if ($params{META_MERGE}{prereqs}) {
+ require CPAN::Meta::Requirements;
+ for my $phase (keys %{$tmp_prereqs || {}}) {
+ for my $rel (keys %{$tmp_prereqs->{$phase} || {}}) {
+ my $req1 =
CPAN::Meta::Requirements->from_string_hash($tmp_prereqs->{$phase}{$rel});
+ my $req2 =
CPAN::Meta::Requirements->from_string_hash($params{META_MERGE}{prereqs}{$phase}{$rel});
+ $req1->add_requirements($req2);
+ $params{META_MERGE}{prereqs}{$phase} =
$req1->as_string_hash;
+ }
+ }
+ } else {
+ $params{META_MERGE}{prereqs} = $tmp_prereqs;
+ }
}
# XXX: better to use also META_MERGE when applicable?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ExtUtils-MakeMaker-CPANfile-0.07/t/01_basic.t
new/ExtUtils-MakeMaker-CPANfile-0.08/t/01_basic.t
--- old/ExtUtils-MakeMaker-CPANfile-0.07/t/01_basic.t 2013-09-22
10:59:52.000000000 +0200
+++ new/ExtUtils-MakeMaker-CPANfile-0.08/t/01_basic.t 2017-06-18
04:42:55.000000000 +0200
@@ -35,18 +35,18 @@
{ # generate cpanfile
open my $fh, '>', "$testdir/cpanfile" or die;
print $fh <<'CF_END';
- requires 'ExtUtils::MakeMaker', 6.17;
+ requires 'ExtUtils::MakeMaker', '6.17';
on configure => sub {
- requires 'ExtUtils::MakeMaker', 6.30;
+ requires 'ExtUtils::MakeMaker', '6.30';
};
on build => sub {
- requires 'Test::More', 0.47;
+ requires 'Test::More', '0.47';
};
on test => sub {
- requires 'Test::More', 0.88;
+ requires 'Test::More', '0.88';
};
CF_END
}
@@ -64,6 +64,7 @@
ok $makefile && $makefile =~
/(?:_REQUIRES|PREREQ_PM)\s*=>\s*{\s*[^{]*ExtUtils::MakeMaker\s*=>\s*q\[/, "EUMM
is listed as some kind of prereqs";
ok $makefile && $makefile =~
/(?:_REQUIRES|PREREQ_PM)\s*=>\s*{\s*[^{]*Test::More\s*=>\s*q\[/, "Test::More is
listed as some kind of prereqs";
+note do { local $/; open my $fh, '<', "$testdir/MYMETA.json"; <$fh> };
done_testing;
END {
