commit perl-Import-Into for openSUSE:Factory

30 Sep 2015

Hello community,

here is the log from the commit of package perl-Import-Into for openSUSE:Factory checked in at 2015-09-30 05:50:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Import-Into (Old)
 and      /work/SRC/openSUSE:Factory/.perl-Import-Into.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "perl-Import-Into"

Changes:
--------

--- /work/SRC/openSUSE:Factory/perl-Import-Into/perl-Import-Into.changes	2014-07-26 09:42:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.perl-Import-Into.new/perl-Import-Into.changes	2015-09-30 05:50:14.000000000 +0200
@@ -1,0 +2,9 @@
+Fri Aug 28 09:53:32 UTC 2015 - coolo@suse.com
+
+- updated to 1.002005
+   see /usr/share/doc/packages/perl-Import-Into/Changes
+
+  1.002005 - 2015-08-28
+    - fix level as a hashref parameter
+
+-------------------------------------------------------------------

Old:
----
  Import-Into-1.002004.tar.gz

New:
----
  Import-Into-1.002005.tar.gz
  cpanspec.yml

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ perl-Import-Into.spec ++++++
--- /var/tmp/diff_new_pack.iMIPpg/_old	2015-09-30 05:50:15.000000000 +0200
+++ /var/tmp/diff_new_pack.iMIPpg/_new	2015-09-30 05:50:15.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package perl-Import-Into
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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,14 +17,15 @@
 
 
 Name:           perl-Import-Into
-Version:        1.002004
+Version:        1.002005
 Release:        0
 %define cpan_name Import-Into
 Summary:        Import packages into other packages
 License:        Artistic-1.0 or GPL-1.0+
 Group:          Development/Libraries/Perl
 Url:            http://search.cpan.org/dist/Import-Into/
-Source:         http://www.cpan.org/authors/id/E/ET/ETHER/%{cpan_name}-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/H/HA/HAARG/%{cpan_name}-%{version}.tar.gz
+Source1:        cpanspec.yml
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  perl
@@ -46,7 +47,6 @@
 
 %prep
 %setup -q -n %{cpan_name}-%{version}
-find . -type f -print0 | xargs -0 chmod 644
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor

++++++ Import-Into-1.002004.tar.gz -> Import-Into-1.002005.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Import-Into-1.002004/Changes new/Import-Into-1.002005/Changes
--- old/Import-Into-1.002004/Changes	2014-07-09 18:25:28.000000000 +0200
+++ new/Import-Into-1.002005/Changes	2015-08-28 02:29:48.000000000 +0200
@@ -1,5 +1,8 @@
 Revision history for Import-Into
 
+1.002005 - 2015-08-28
+  - fix level as a hashref parameter
+
 1.002004 - 2014-07-09
   - fix prerequisite declarations for older toolchain
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Import-Into-1.002004/MANIFEST new/Import-Into-1.002005/MANIFEST
--- old/Import-Into-1.002004/MANIFEST	2014-07-09 18:25:40.000000000 +0200
+++ new/Import-Into-1.002005/MANIFEST	2015-08-28 02:29:57.000000000 +0200
@@ -1,7 +1,5 @@
 Changes
 lib/Import/Into.pm
-maint/bump-version
-maint/Makefile.include
 maint/Makefile.PL.include
 Makefile.PL
 MANIFEST			This list of files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Import-Into-1.002004/META.json new/Import-Into-1.002005/META.json
--- old/Import-Into-1.002004/META.json	2014-07-09 18:25:39.000000000 +0200
+++ new/Import-Into-1.002005/META.json	2015-08-28 02:29:56.000000000 +0200
@@ -4,7 +4,7 @@
       "mst - Matt S. Trout (cpan:MSTROUT) <mst@shadowcat.co.uk>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.141520",
+   "generated_by" : "ExtUtils::MakeMaker version 7.0401, CPAN::Meta::Converter version 2.150001",
    "license" : [
       "perl_5"
    ],
@@ -20,6 +20,12 @@
       ]
    },
    "prereqs" : {
+      "build" : {},
+      "configure" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
       "runtime" : {
          "requires" : {
             "Module::Runtime" : "0",
@@ -48,5 +54,5 @@
          "web" : "http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/Import-Into.git"
       }
    },
-   "version" : "1.002004"
+   "version" : "1.002005"
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Import-Into-1.002004/META.yml new/Import-Into-1.002005/META.yml
--- old/Import-Into-1.002004/META.yml	2014-07-09 18:25:39.000000000 +0200
+++ new/Import-Into-1.002005/META.yml	2015-08-28 02:29:56.000000000 +0200
@@ -6,8 +6,10 @@
   Exporter: '0'
   Test::More: '0'
   base: '0'
+configure_requires:
+  ExtUtils::MakeMaker: '0'
 dynamic_config: 0
-generated_by: 'ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.141520'
+generated_by: 'ExtUtils::MakeMaker version 7.0401, CPAN::Meta::Converter version 2.150001'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -25,4 +27,4 @@
 resources:
   bugtracker: https://rt.cpan.org/Public/Dist/Display.html?Name=Import-Into
   repository: git://git.shadowcat.co.uk/p5sagit/Import-Into.git
-version: '1.002004'
+version: '1.002005'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Import-Into-1.002004/Makefile.PL new/Import-Into-1.002005/Makefile.PL
--- old/Import-Into-1.002004/Makefile.PL	2014-07-09 18:10:52.000000000 +0200
+++ new/Import-Into-1.002005/Makefile.PL	2014-08-21 17:47:12.000000000 +0200
@@ -1,82 +1,88 @@
 use strict;
 use warnings FATAL => 'all';
-use ExtUtils::MakeMaker;
-(do 'maint/Makefile.PL.include' or die $@) unless -f 'META.yml';
 
-my %WriteMakefileArgs = (
-  NAME => 'Import::Into',
-  VERSION_FROM => 'lib/Import/Into.pm',
-  PREREQ_PM => { },
-  LICENSE => 'perl',
-
-  META_MERGE => {
-    'meta-spec' => { version => 2 },
-    dynamic_config => 0,
-    resources => {
-      # r/w: p5sagit@git.shadowcat.co.uk:Import-Into.git
-      repository => {
-        url => 'git://git.shadowcat.co.uk/p5sagit/Import-Into.git',
-        web => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/Import-Into.git',
-        type => 'git',
-      },
-      bugtracker => {
-          mailto => 'bug-Import-Into@rt.cpan.org',
-          web => 'https://rt.cpan.org/Public/Dist/Display.html?Name=Import-Into',
-      },
+my %META = (
+  name => 'Import-Into',
+  license => 'perl_5',
+  dynamic_config => 0,
+  resources => {
+    # r/w: p5sagit@git.shadowcat.co.uk:Import-Into.git
+    repository => {
+      url => 'git://git.shadowcat.co.uk/p5sagit/Import-Into.git',
+      web => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/Import-Into.git',
+      type => 'git',
+    },
+    bugtracker => {
+        mailto => 'bug-Import-Into@rt.cpan.org',
+        web => 'https://rt.cpan.org/Public/Dist/Display.html?Name=Import-Into',
     },
   },
-
-  META_ADD => {
-    prereqs => {
-      runtime => {
-        requires => {
-          'strict' => '0',
-          'warnings' => '0',
-          'Module::Runtime' => '0',
-          'perl' => '5.006',
-        },
+  prereqs => {
+    configure => {
+      requires => {
+        'ExtUtils::MakeMaker' => 0,
+      },
+    },
+    runtime => {
+      requires => {
+        'strict' => '0',
+        'warnings' => '0',
+        'Module::Runtime' => '0',
+        'perl' => '5.006',
       },
-      test => {
-        requires => {
-          'Exporter' => '0',
-          'base' => '0',
-          'Test::More' => '0',
-        },
+    },
+    test => {
+      requires => {
+        'Exporter' => '0',
+        'base' => '0',
+        'Test::More' => '0',
       },
     },
   },
+);
 
-  realclean => { FILES => [ 'Distar/', 'MANIFEST*' ] },
+my %MM_ARGS = (
 );
 
+## BOILERPLATE ###############################################################
+require ExtUtils::MakeMaker;
+(do 'maint/Makefile.PL.include' or die $@) unless -f 'META.yml';
+
+# have to do this since old EUMM dev releases miss the eval $VERSION line
 my $eumm_version  = eval $ExtUtils::MakeMaker::VERSION;
+my $mymeta        = $eumm_version >= 6.57_02;
+my $mymeta_broken = $mymeta && $eumm_version < 6.57_07;
+
+($MM_ARGS{NAME} = $META{name}) =~ s/-/::/g;
+($MM_ARGS{VERSION_FROM} = "lib/$MM_ARGS{NAME}.pm") =~ s{::}{/}g;
+$META{license} = [ $META{license} ]
+  if $META{license} && !ref $META{license};
+$MM_ARGS{LICENSE} = $META{license}[0]
+  if $META{license} && $eumm_version >= 6.30;
+$MM_ARGS{NO_MYMETA} = 1
+  if $mymeta_broken;
+$MM_ARGS{META_ADD} = { 'meta-spec' => { version => 2 }, %META }
+  unless -f 'META.yml';
 
 for (qw(configure build test runtime)) {
   my $key = $_ eq 'runtime' ? 'PREREQ_PM' : uc $_.'_REQUIRES';
-  next unless exists $WriteMakefileArgs{META_ADD}{prereqs}{$_}
-           or exists $WriteMakefileArgs{$key};
-  my $r = $WriteMakefileArgs{$key} = {
-    %{$WriteMakefileArgs{META_ADD}{prereqs}{$_}{requires} || {}},
-    %{delete $WriteMakefileArgs{$key} || {}},
+  my $r = $MM_ARGS{$key} = {
+    %{$META{prereqs}{$_}{requires} || {}},
+    %{delete $MM_ARGS{$key} || {}},
   };
   defined $r->{$_} or delete $r->{$_} for keys %$r;
 }
 
-# dynamic prereqs get added here.
-
-$WriteMakefileArgs{MIN_PERL_VERSION} = delete $WriteMakefileArgs{PREREQ_PM}{perl} || 0;
-
-$WriteMakefileArgs{BUILD_REQUIRES} = {
-    %{$WriteMakefileArgs{BUILD_REQUIRES} || {}},
-    %{delete $WriteMakefileArgs{TEST_REQUIRES}}
-} if $eumm_version < 6.63_03;
-
-$WriteMakefileArgs{PREREQ_PM} = {
-    %{$WriteMakefileArgs{PREREQ_PM}},
-    %{delete $WriteMakefileArgs{BUILD_REQUIRES}}
-} if $eumm_version < 6.55_01;
+$MM_ARGS{MIN_PERL_VERSION} = delete $MM_ARGS{PREREQ_PM}{perl} || 0;
 
-delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
+delete $MM_ARGS{MIN_PERL_VERSION}
+  if $eumm_version < 6.47_01;
+$MM_ARGS{BUILD_REQUIRES} = {%{$MM_ARGS{BUILD_REQUIRES}}, %{delete $MM_ARGS{TEST_REQUIRES}}}
+  if $eumm_version < 6.63_03;
+$MM_ARGS{PREREQ_PM} = {%{$MM_ARGS{PREREQ_PM}}, %{delete $MM_ARGS{BUILD_REQUIRES}}}
+  if $eumm_version < 6.55_01;
+delete $MM_ARGS{CONFIGURE_REQUIRES}
   if $eumm_version < 6.51_03;
 
-WriteMakefile(%WriteMakefileArgs);
+ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS);
+## END BOILERPLATE ###########################################################
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Import-Into-1.002004/lib/Import/Into.pm new/Import-Into-1.002005/lib/Import/Into.pm
--- old/Import-Into-1.002004/lib/Import/Into.pm	2014-07-09 18:14:56.000000000 +0200
+++ new/Import-Into-1.002005/lib/Import/Into.pm	2015-08-28 02:29:43.000000000 +0200
@@ -4,12 +4,12 @@
 use warnings FATAL => 'all';
 use Module::Runtime;
 
-our $VERSION = '1.002004';
+our $VERSION = '1.002005';
 
 sub _prelude {
   my $target = shift;
   my ($package, $file, $line, $level)
-    = ref $target         ? @{$target}{qw(package filename line)}
+    = ref $target         ? @{$target}{qw(package filename line level)}
     : $target =~ /[^0-9]/ ? ($target)
                           : (undef, undef, undef, $target);
   if (defined $level) {
@@ -25,9 +25,13 @@
 sub _make_action {
   my ($action, $target) = @_;
   my $version = ref $target && $target->{version};
-  my $ver_check = $version ? ', $version' : '';
   eval _prelude($target)
-    . qq{sub { Module::Runtime::use_module( shift$ver_check )->$action(\@_) }}
+    . q[sub {]
+    . q[  my $module = shift;]
+    . q[  Module::Runtime::require_module($module);]
+    . (ref $target && exists $target->{version} ? q[  $module->VERSION($version);] : q[])
+    . q[  $module->].$action.q[(@_);]
+    . q[}]
     or die "Failed to build action sub to ${action} for ${target}: $@";
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Import-Into-1.002004/maint/Makefile.include new/Import-Into-1.002005/maint/Makefile.include
--- old/Import-Into-1.002004/maint/Makefile.include	2014-07-04 03:32:13.000000000 +0200
+++ new/Import-Into-1.002005/maint/Makefile.include	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-bump:
-	maint/bump-version
-	rm Makefile
-bumpminor:
-	maint/bump-version minor
-	rm Makefile
-bumpmajor:
-	maint/bump-version major
-	rm Makefile
-upload: $(DISTVNAME).tar$(SUFFIX)
-	cpan-upload $<
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Import-Into-1.002004/maint/bump-version new/Import-Into-1.002005/maint/bump-version
--- old/Import-Into-1.002004/maint/bump-version	2014-07-09 02:05:59.000000000 +0200
+++ new/Import-Into-1.002005/maint/bump-version	1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-#!/usr/bin/env perl
-
-use 5.010;
-use strict;
-use warnings FATAL => 'all';
-use autodie;
-
-chomp(my $LATEST = qx(grep '^[0-9]' Changes | head -1 | awk '{print \$1}'));
-
-my @parts = map { m/(\d{1,3})/g } split /\./, $LATEST;
-push @parts, 0, 0;
-
-my $OLD_DECIMAL = sprintf('%i.%03i%03i', @parts);
-
-my %bump_part = (major => 0, minor => 1, bugfix => 2);
-
-my $bump_this = 
-  $bump_part{$ARGV[0]||'bugfix'}
-    // die "no idea which part to bump - $ARGV[0] means nothing to me";
-
-my @new_parts = @parts;
-
-$new_parts[$bump_this]++;
-
-my $NEW_DECIMAL = sprintf('%i.%03i%03i', @new_parts);
-
-my @PM_FILES = ( 'lib/Import/Into.pm' );
-
-foreach my $filename (@PM_FILES) {
-  warn "Bumping $OLD_DECIMAL -> $NEW_DECIMAL in $filename\n";
-
-  my $file = do { local (@ARGV, $/) = ($filename); <> };
-
-  $file =~ s/(?<=\$VERSION = ')${\quotemeta $OLD_DECIMAL}/${NEW_DECIMAL}/;
-
-  open my $out, '>', $filename;
-
-  print $out $file;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Import-Into-1.002004/t/import_into.t new/Import-Into-1.002005/t/import_into.t
--- old/Import-Into-1.002004/t/import_into.t	2014-07-09 01:52:45.000000000 +0200
+++ new/Import-Into-1.002005/t/import_into.t	2015-08-28 02:28:18.000000000 +0200
@@ -3,18 +3,35 @@
 use Test::More qw(no_plan);
 
 BEGIN {
-
   package MyExporter;
+  $INC{"MyExporter.pm"} = __FILE__;
 
   use base qw(Exporter);
 
   our @EXPORT_OK = qw(thing);
 
   sub thing { 'thing' }
+}
+
+my @importcaller;
+my @versioncaller;
+my $version;
+BEGIN {
+  package CheckFile;
+  $INC{"CheckFile.pm"} = __FILE__;
 
-  $INC{"MyExporter.pm"} = 1;
+  sub import {
+    @importcaller = caller;
+  }
+  sub VERSION {
+    $version = $_[1];
+    @versioncaller = caller;
+  }
+}
 
+BEGIN {
   package MultiExporter;
+  $INC{"MultiExporter.pm"} = __FILE__;
 
   use Import::Into;
 
@@ -23,30 +40,10 @@
     warnings->import::into($target);
     MyExporter->import::into($target, 'thing');
     CheckFile->import::into(1);
-
-  }
-
-  $INC{"MultiExporter.pm"} = 1;
-}
-
-my @checkcaller;
-my $checkversion;
-BEGIN {
-
-  package CheckFile;
-
-  sub import {
-    @checkcaller = caller;
   }
-  sub VERSION {
-    $checkversion = $_[1];
-  }
-
-  $INC{"CheckFile.pm"} = 1;
 }
 
 eval q{
-
   package TestPackage;
 
   no warnings FATAL => 'all';
@@ -71,10 +68,17 @@
 
 like($w[0], qr/uninitialized/, 'Correct warning');
 
-is $checkcaller[0], 'TestPackage', 'import by level has correct package';
-is $checkcaller[1], 'import_into_inline.pl', 'import by level has correct file';
-is $checkcaller[2], 1, 'import by level has correct line';
-
+is $importcaller[0], 'TestPackage',
+  'import by level has correct package';
+is $importcaller[1], 'import_into_inline.pl',
+  'import by level has correct file';
+is $importcaller[2], 1,
+  'import by level has correct line';
+is scalar @versioncaller, 0, 'VERSION not called when not specified';
+
+@importcaller = ();
+@versioncaller = ();
+$version = undef;
 CheckFile->import::into({
   package  => 'ExplicitPackage',
   filename => 'explicit-file.pl',
@@ -82,10 +86,58 @@
   version  => 219,
 });
 
-is $checkcaller[0], 'ExplicitPackage',  'import with hash has correct package';
-is $checkcaller[1], 'explicit-file.pl', 'import with hash has correct file';
-is $checkcaller[2], 42,                 'import with hash has correct line';
-is $checkversion, 219,                  'import with hash has correct version';
+is $importcaller[0], 'ExplicitPackage',
+  'import with hash has correct package';
+is $importcaller[1], 'explicit-file.pl',
+  'import with hash has correct file';
+is $importcaller[2], 42,
+  'import with hash has correct line';
+is $versioncaller[0], 'ExplicitPackage',
+  'VERSION with hash has correct package';
+is $versioncaller[1], 'explicit-file.pl',
+  'VERSION with hash has correct file';
+is $versioncaller[2], 42,
+  'VERSION with hash has correct line';
+is $version, 219,
+  'import with hash has correct version';
+
+BEGIN {
+  package LevelExporter;
+  $INC{'LevelExporter.pm'} = __FILE__;
+
+  sub import {
+    CheckFile->import::into({
+      level    => 1,
+      version  => 219,
+    });
+  }
+}
+
+@importcaller = ();
+@versioncaller = ();
+$version = undef;
+eval q{
+  package ExplicitLevel;
+
+#line 42 "explicit-level.pl"
+  use LevelExporter;
+  1;
+} or die $@;
+
+is $importcaller[0], 'ExplicitLevel',
+  'import with level in hash has correct package';
+is $importcaller[1], 'explicit-level.pl',
+  'import with level in hash has correct file';
+is $importcaller[2], 42,
+  'import with level in hash has correct line';
+is $versioncaller[0], 'ExplicitLevel',
+  'VERSION with level in hash has correct package';
+is $versioncaller[1], 'explicit-level.pl',
+  'VERSION with level in hash has correct file';
+is $versioncaller[2], 42,
+  'VERSION with level in hash has correct line';
+is $version, 219,
+  'import with level in hash has correct version';
 
 ok( !IPC::Open3->can("open3"), "IPC::Open3 is unloaded" );
 IPC::Open3->import::into("TestPackage");

++++++ cpanspec.yml ++++++
---
#description_paragraphs: 3
#no_testing: broken upstream
#sources:
#  - source1
#  - source2
#patches:
#  foo.patch: -p1
#  bar.patch:
#preamble: |-
# BuildRequires:  gcc-c++
#post_prep: |-
# hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s,  *,,g'`
# sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL 
#post_install: |-
# sed on %{name}.files
#license: SUSE-NonFree
#skip_noarch: 1
#custom_build: |-
#./Build build flags=%{?_smp_mflags} --myflag
#custom_test: |-
#startserver && make test
#ignore_requires: Bizarre::Module

    

commit perl-Import-Into for openSUSE:Factory

root＠hilbert.suse.de