Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package perl-Module-Install for 
openSUSE:Factory checked in at 2023-05-04 17:10:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Module-Install (Old)
 and      /work/SRC/openSUSE:Factory/.perl-Module-Install.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "perl-Module-Install"

Thu May  4 17:10:35 2023 rev:17 rq:1084434 version:1.21

Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Module-Install/perl-Module-Install.changes  
2018-02-09 15:47:29.051524455 +0100
+++ 
/work/SRC/openSUSE:Factory/.perl-Module-Install.new.1533/perl-Module-Install.changes
        2023-05-04 17:10:55.060485502 +0200
@@ -1,0 +2,12 @@
+Sat Apr 29 03:11:35 UTC 2023 - Tina Müller <timueller+p...@suse.de>
+
+- updated to 1.21
+   see /usr/share/doc/packages/perl-Module-Install/Changes
+
+  1.21  2023-04-28
+    - fix tests broken by Module::Install::DSL removal
+
+  1.20  2023-04-27
+    - Module::Install::DSL has been removed, as its use is highly discouraged.
+
+-------------------------------------------------------------------

Old:
----
  Module-Install-1.19.tar.gz

New:
----
  Module-Install-1.21.tar.gz

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

Other differences:
------------------
++++++ perl-Module-Install.spec ++++++
--- /var/tmp/diff_new_pack.nxnxaP/_old  2023-05-04 17:10:55.452487797 +0200
+++ /var/tmp/diff_new_pack.nxnxaP/_new  2023-05-04 17:10:55.456487821 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package perl-Module-Install
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,22 +12,20 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
+%define cpan_name Module-Install
 Name:           perl-Module-Install
-Version:        1.19
+Version:        1.21
 Release:        0
-%define cpan_name Module-Install
+License:        Artistic-1.0 OR GPL-1.0-or-later
 Summary:        Standalone, extensible Perl module installer
-License:        Artistic-1.0 or GPL-1.0+
-Group:          Development/Libraries/Perl
-Url:            http://search.cpan.org/dist/Module-Install/
+URL:            https://metacpan.org/release/%{cpan_name}
 Source0:        
https://cpan.metacpan.org/authors/id/E/ET/ETHER/%{cpan_name}-%{version}.tar.gz
 Source1:        cpanspec.yml
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  perl
 BuildRequires:  perl-macros
 BuildRequires:  perl(Devel::PPPort) >= 3.16
@@ -75,14 +73,14 @@
 (Do What I Mean) as possible when writing them.
 
 %prep
-%setup -q -n %{cpan_name}-%{version}
+%autosetup  -n %{cpan_name}-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__make} %{?_smp_mflags}
+perl Makefile.PL INSTALLDIRS=vendor
+%make_build
 
 %check
-%{__make} test
+make test
 
 %install
 %perl_make_install
@@ -90,7 +88,6 @@
 %perl_gen_filelist
 
 %files -f %{name}.files
-%defattr(-,root,root,755)
 %doc Changes README TODO
 
 %changelog

++++++ Module-Install-1.19.tar.gz -> Module-Install-1.21.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/.travis.yml 
new/Module-Install-1.21/.travis.yml
--- old/Module-Install-1.19/.travis.yml 2017-12-20 00:27:31.000000000 +0100
+++ new/Module-Install-1.21/.travis.yml 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-language: perl
-perl:
-  - blead       # builds perl from git
-  - dev         # latest point release
-  - '5.26'
-  - '5.24'
-  - '5.22'
-  - '5.20'
-  - '5.18'
-  - '5.16'
-  - '5.14'
-  - '5.12'
-  - '5.10'
-  - '5.8'
-before_install:
-  - git clone git://github.com/travis-perl/helpers ~/travis-perl-helpers
-  - source ~/travis-perl-helpers/init
-  - build-perl
-  - perl -V
-  - build-dist
-  - cd $BUILD_DIR
-install:
-  - cpan-install YAML::Tiny File::Remove Module::Build Module::ScanDeps 
Parse::CPAN::Meta
-script:
-  - perl Makefile.PL
-  - make
-  - prove -b -r -s -j1 $(test-files)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/Changes 
new/Module-Install-1.21/Changes
--- old/Module-Install-1.19/Changes     2017-12-20 00:29:13.000000000 +0100
+++ new/Module-Install-1.21/Changes     2023-04-28 10:23:55.000000000 +0200
@@ -1,5 +1,11 @@
 Changes for Perl programming language extension Module-Install
 
+1.21  2023-04-28
+  - fix tests broken by Module::Install::DSL removal
+
+1.20  2023-04-27
+  - Module::Install::DSL has been removed, as its use is highly discouraged.
+
 1.19  2017-12-19
   - remove use of INIT phase in Module::Install::DSL, to fix issues on perl
     5.27.7 (see cpan RT#123867 and perl RT#132577)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/MANIFEST 
new/Module-Install-1.21/MANIFEST
--- old/Module-Install-1.19/MANIFEST    2017-04-04 21:29:13.000000000 +0200
+++ new/Module-Install-1.21/MANIFEST    2023-04-28 10:27:13.000000000 +0200
@@ -1,9 +1,7 @@
 .ackrc
 .mailmap
-.travis.yml
 Changes
 lib/inc/Module/Install.pm
-lib/inc/Module/Install/DSL.pm
 lib/Module/AutoInstall.pm
 lib/Module/Install.pm
 lib/Module/Install.pod
@@ -24,7 +22,6 @@
 lib/Module/Install/Can.pm
 lib/Module/Install/Compiler.pm
 lib/Module/Install/Deprecated.pm
-lib/Module/Install/DSL.pm
 lib/Module/Install/External.pm
 lib/Module/Install/FAQ.pod
 lib/Module/Install/Fetch.pm
@@ -53,7 +50,6 @@
 t/05_share.t
 t/06_ppport.t
 t/07_perl_version.t
-t/08_dsl.t
 t/09_read.t
 t/10_test.t
 t/11_extraction.t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/META.yml 
new/Module-Install-1.21/META.yml
--- old/Module-Install-1.19/META.yml    2017-12-20 00:30:05.000000000 +0100
+++ new/Module-Install-1.21/META.yml    2023-04-28 10:29:39.000000000 +0200
@@ -12,7 +12,7 @@
   YAML::Tiny: '1.33'
 distribution_type: module
 dynamic_config: 0
-generated_by: 'Module::Install version 1.19'
+generated_by: 'Module::Install version 1.21'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -47,7 +47,7 @@
 resources:
   license: http://dev.perl.org/licenses/
   repository: https://github.com/Perl-Toolchain-Gang/Module-Install.git
-version: '1.19'
+version: '1.21'
 x_contributors:
   - 'Adam Kennedy <a...@ali.as>'
   - 'Kenichi Ishigaki <ishig...@cpan.org>'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/AutoInstall.pm 
new/Module-Install-1.21/lib/Module/AutoInstall.pm
--- old/Module-Install-1.19/lib/Module/AutoInstall.pm   2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/AutoInstall.pm   2023-04-27 
10:20:34.000000000 +0200
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
 }
 
 # special map on pre-defined feature sets
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/Module-Install-1.19/lib/Module/Install/Admin/Bundle.pm 
new/Module-Install-1.21/lib/Module/Install/Admin/Bundle.pm
--- old/Module-Install-1.19/lib/Module/Install/Admin/Bundle.pm  2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Admin/Bundle.pm  2023-04-27 
10:20:34.000000000 +0200
@@ -5,7 +5,7 @@
 
 use vars qw{$VERSION @ISA};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = qw{Module::Install::Base};
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/Module-Install-1.19/lib/Module/Install/Admin/Compiler.pm 
new/Module-Install-1.21/lib/Module/Install/Admin/Compiler.pm
--- old/Module-Install-1.19/lib/Module/Install/Admin/Compiler.pm        
2017-04-04 21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Admin/Compiler.pm        
2023-04-27 10:20:34.000000000 +0200
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION @ISA};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = qw{Module::Install::Base};
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/Admin/Find.pm 
new/Module-Install-1.21/lib/Module/Install/Admin/Find.pm
--- old/Module-Install-1.19/lib/Module/Install/Admin/Find.pm    2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Admin/Find.pm    2023-04-27 
10:20:34.000000000 +0200
@@ -5,7 +5,7 @@
 use Module::Install::Base ();
 use vars qw{$VERSION @ISA};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA = qw(Module::Install::Base);
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/Module-Install-1.19/lib/Module/Install/Admin/Include.pm 
new/Module-Install-1.21/lib/Module/Install/Admin/Include.pm
--- old/Module-Install-1.19/lib/Module/Install/Admin/Include.pm 2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Admin/Include.pm 2023-04-27 
10:20:34.000000000 +0200
@@ -5,7 +5,7 @@
 
 use vars qw{$VERSION @ISA};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = qw{Module::Install::Base};
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/Module-Install-1.19/lib/Module/Install/Admin/Makefile.pm 
new/Module-Install-1.21/lib/Module/Install/Admin/Makefile.pm
--- old/Module-Install-1.19/lib/Module/Install/Admin/Makefile.pm        
2017-04-04 21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Admin/Makefile.pm        
2023-04-27 10:20:34.000000000 +0200
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = qw{Module::Install::Base};
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/Module-Install-1.19/lib/Module/Install/Admin/Manifest.pm 
new/Module-Install-1.21/lib/Module/Install/Admin/Manifest.pm
--- old/Module-Install-1.19/lib/Module/Install/Admin/Manifest.pm        
2017-04-04 21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Admin/Manifest.pm        
2023-04-27 10:20:34.000000000 +0200
@@ -5,7 +5,7 @@
 
 use vars qw{$VERSION @ISA};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = qw{Module::Install::Base};
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/Module-Install-1.19/lib/Module/Install/Admin/Metadata.pm 
new/Module-Install-1.21/lib/Module/Install/Admin/Metadata.pm
--- old/Module-Install-1.19/lib/Module/Install/Admin/Metadata.pm        
2017-04-04 21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Admin/Metadata.pm        
2023-04-27 10:20:34.000000000 +0200
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install::Base';
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/Module-Install-1.19/lib/Module/Install/Admin/ScanDeps.pm 
new/Module-Install-1.21/lib/Module/Install/Admin/ScanDeps.pm
--- old/Module-Install-1.19/lib/Module/Install/Admin/ScanDeps.pm        
2017-04-04 21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Admin/ScanDeps.pm        
2023-04-27 10:20:34.000000000 +0200
@@ -4,7 +4,7 @@
 use Module::Install::Base ();
 use vars qw{$VERSION @ISA};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA = qw(Module::Install::Base);
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/Module-Install-1.19/lib/Module/Install/Admin/WriteAll.pm 
new/Module-Install-1.21/lib/Module/Install/Admin/WriteAll.pm
--- old/Module-Install-1.19/lib/Module/Install/Admin/WriteAll.pm        
2017-04-04 21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Admin/WriteAll.pm        
2023-04-27 10:20:34.000000000 +0200
@@ -5,7 +5,7 @@
 
 use vars qw{$VERSION @ISA};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = qw{Module::Install::Base};
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/Admin.pm 
new/Module-Install-1.21/lib/Module/Install/Admin.pm
--- old/Module-Install-1.19/lib/Module/Install/Admin.pm 2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Admin.pm 2023-04-27 
10:20:34.000000000 +0200
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install';
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/Module-Install-1.19/lib/Module/Install/AutoInstall.pm 
new/Module-Install-1.21/lib/Module/Install/AutoInstall.pm
--- old/Module-Install-1.19/lib/Module/Install/AutoInstall.pm   2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/AutoInstall.pm   2023-04-27 
10:20:34.000000000 +0200
@@ -5,7 +5,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install::Base';
        $ISCORE  = 1;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/Base.pm 
new/Module-Install-1.21/lib/Module/Install/Base.pm
--- old/Module-Install-1.19/lib/Module/Install/Base.pm  2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Base.pm  2023-04-27 
10:20:34.000000000 +0200
@@ -3,7 +3,7 @@
 use strict 'vars';
 use vars qw{$VERSION};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
 }
 
 # Suspend handler for "redefined" warnings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/Bundle.pm 
new/Module-Install-1.21/lib/Module/Install/Bundle.pm
--- old/Module-Install-1.19/lib/Module/Install/Bundle.pm        2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Bundle.pm        2023-04-27 
10:20:34.000000000 +0200
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install::Base';
        $ISCORE  = 1;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/Can.pm 
new/Module-Install-1.21/lib/Module/Install/Can.pm
--- old/Module-Install-1.19/lib/Module/Install/Can.pm   2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Can.pm   2023-04-27 
10:20:34.000000000 +0200
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install::Base';
        $ISCORE  = 1;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/Compiler.pm 
new/Module-Install-1.21/lib/Module/Install/Compiler.pm
--- old/Module-Install-1.19/lib/Module/Install/Compiler.pm      2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Compiler.pm      2023-04-27 
10:20:34.000000000 +0200
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install::Base';
        $ISCORE  = 1;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/DSL.pm 
new/Module-Install-1.21/lib/Module/Install/DSL.pm
--- old/Module-Install-1.19/lib/Module/Install/DSL.pm   2017-12-20 
00:28:01.000000000 +0100
+++ new/Module-Install-1.21/lib/Module/Install/DSL.pm   1970-01-01 
01:00:00.000000000 +0100
@@ -1,101 +0,0 @@
-package Module::Install::DSL;
-
-use strict;
-use vars qw{$VERSION $ISCORE};
-BEGIN {
-       $VERSION = '1.19';
-       $ISCORE  = 1;
-       *inc::Module::Install::DSL::VERSION = *VERSION;
-       @inc::Module::Install::DSL::ISA     = __PACKAGE__;
-}
-
-sub import {
-       # Read in the rest of the Makefile.PL
-       open 0 or die "Couldn't open $0: $!";
-       my $dsl;
-       SCOPE: {
-               local $/ = undef;
-               $dsl = join "", <0>;
-       }
-
-       # Change inc::Module::Install::DSL to the regular one.
-       # Remove anything before the use inc::... line.
-       $dsl =~ 
s/.*?^\s*use\s+(?:inc::)?Module::Install::DSL(\b[^;]*);\s*\n//sm;
-
-       # Load inc::Module::Install as we would in a regular Makefile.Pl
-       SCOPE: {
-               package main;
-               require inc::Module::Install;
-               inc::Module::Install->import;
-       }
-
-       # Add the ::DSL plugin to the list of packages in /inc
-       my $admin = $Module::Install::MAIN->{admin};
-       if ( $admin ) {
-               my $from = $INC{"$admin->{path}/DSL.pm"};
-               my $to   = 
"$admin->{base}/$admin->{prefix}/$admin->{path}/DSL.pm";
-               $admin->copy( $from => $to );
-       }
-
-       # Convert the basic syntax to code
-       my $code = "{\n"
-                . "package main;\n\n"
-                . dsl2code($dsl)
-                . "\n\nWriteAll();\n"
-                . "}\n";
-
-       # Execute the script
-       eval $code;
-       print STDERR "Failed to execute the generated code...\n$@" if $@;
-
-       exit(0);
-}
-
-sub dsl2code {
-       my $dsl = shift;
-
-       # Split into lines and strip blanks
-       my @lines = grep { /\S/ } split /[\012\015]+/, $dsl;
-
-       # Each line represents one command
-       my @code   = ();
-       my $static = 1;
-       foreach my $line ( @lines ) {
-               # Split the lines into tokens
-               my @tokens = split /\s+/, $line;
-
-               # The first word is the command
-               my $command = shift @tokens;
-               my @params  = ();
-               my @suffix  = ();
-               while ( @tokens ) {
-                       my $token = shift @tokens;
-                       if ( $token eq 'if' or $token eq 'unless' ) {
-                               # This is the beginning of a suffix
-                               push @suffix, $token;
-                               push @suffix, @tokens;
-
-                               # The conditional means this distribution
-                               # can no longer be considered fully static.
-                               $static = 0;
-                               last;
-                       } else {
-                               # Convert to a string
-                               $token =~ s/([\\\'])/\\$1/g;
-                               push @params, "'$token'";
-                       }       
-               };
-
-               # Merge to create the final line of code
-               @tokens = ( $command, @params ? join( ', ', @params ) : (), 
@suffix );
-               push @code, join( ' ', @tokens ) . ";\n";
-       }
-
-       # Is our configuration static?
-       push @code, "static_config;\n" if $static;
-
-       # Join into the complete code block
-       return join( '', @code );
-}
-
-1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/Deprecated.pm 
new/Module-Install-1.21/lib/Module/Install/Deprecated.pm
--- old/Module-Install-1.19/lib/Module/Install/Deprecated.pm    2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Deprecated.pm    2023-04-27 
10:20:34.000000000 +0200
@@ -5,7 +5,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install::Base';
        $ISCORE  = 1;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/External.pm 
new/Module-Install-1.21/lib/Module/Install/External.pm
--- old/Module-Install-1.19/lib/Module/Install/External.pm      2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/External.pm      2023-04-27 
10:20:34.000000000 +0200
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        $ISCORE  = 1;
        @ISA     = qw{Module::Install::Base};
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/Fetch.pm 
new/Module-Install-1.21/lib/Module/Install/Fetch.pm
--- old/Module-Install-1.19/lib/Module/Install/Fetch.pm 2017-12-19 
06:18:55.000000000 +0100
+++ new/Module-Install-1.21/lib/Module/Install/Fetch.pm 2023-04-27 
10:20:34.000000000 +0200
@@ -5,7 +5,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install::Base';
        $ISCORE  = 1;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/Include.pm 
new/Module-Install-1.21/lib/Module/Install/Include.pm
--- old/Module-Install-1.19/lib/Module/Install/Include.pm       2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Include.pm       2023-04-27 
10:20:34.000000000 +0200
@@ -5,7 +5,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install::Base';
        $ISCORE  = 1;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/Inline.pm 
new/Module-Install-1.21/lib/Module/Install/Inline.pm
--- old/Module-Install-1.19/lib/Module/Install/Inline.pm        2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Inline.pm        2023-04-27 
10:20:34.000000000 +0200
@@ -5,7 +5,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install::Base';
        $ISCORE  = 1;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/MakeMaker.pm 
new/Module-Install-1.21/lib/Module/Install/MakeMaker.pm
--- old/Module-Install-1.19/lib/Module/Install/MakeMaker.pm     2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/MakeMaker.pm     2023-04-27 
10:20:34.000000000 +0200
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install::Base';
        $ISCORE  = 1;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/Makefile.pm 
new/Module-Install-1.21/lib/Module/Install/Makefile.pm
--- old/Module-Install-1.19/lib/Module/Install/Makefile.pm      2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Makefile.pm      2023-04-27 
10:20:34.000000000 +0200
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install::Base';
        $ISCORE  = 1;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/Metadata.pm 
new/Module-Install-1.21/lib/Module/Install/Metadata.pm
--- old/Module-Install-1.19/lib/Module/Install/Metadata.pm      2017-12-20 
00:05:31.000000000 +0100
+++ new/Module-Install-1.21/lib/Module/Install/Metadata.pm      2023-04-27 
10:20:34.000000000 +0200
@@ -5,7 +5,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install::Base';
        $ISCORE  = 1;
 }
@@ -454,12 +454,8 @@
 my %license_urls = (
     perl         => 'http://dev.perl.org/licenses/',
     apache       => 'http://apache.org/licenses/LICENSE-2.0',
-    apache_1_1   => 'http://apache.org/licenses/LICENSE-1.1',
     artistic     => 'http://opensource.org/licenses/artistic-license.php',
-    artistic_2   => 'http://opensource.org/licenses/artistic-license-2.0.php',
     lgpl         => 'http://opensource.org/licenses/lgpl-license.php',
-    lgpl2        => 'http://opensource.org/licenses/lgpl-2.1.php',
-    lgpl3        => 'http://opensource.org/licenses/lgpl-3.0.html',
     bsd          => 'http://opensource.org/licenses/bsd-license.php',
     gpl          => 'http://opensource.org/licenses/gpl-license.php',
     gpl2         => 'http://opensource.org/licenses/gpl-2.0.php',
@@ -470,6 +466,12 @@
     unrestricted => undef,
     restrictive  => undef,
     unknown      => undef,
+
+    # these are not actually allowed in meta-spec v1.4 but are left here for 
compatibility:
+    apache_1_1   => 'http://apache.org/licenses/LICENSE-1.1',
+    artistic_2   => 'http://opensource.org/licenses/artistic-license-2.0.php',
+    lgpl2        => 'http://opensource.org/licenses/lgpl-2.1.php',
+    lgpl3        => 'http://opensource.org/licenses/lgpl-3.0.html',
 );
 
 sub license {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/PAR.pm 
new/Module-Install-1.21/lib/Module/Install/PAR.pm
--- old/Module-Install-1.19/lib/Module/Install/PAR.pm   2017-12-19 
06:19:07.000000000 +0100
+++ new/Module-Install-1.21/lib/Module/Install/PAR.pm   2023-04-27 
10:20:34.000000000 +0200
@@ -5,7 +5,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install::Base';
        $ISCORE  = 1;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/Run.pm 
new/Module-Install-1.21/lib/Module/Install/Run.pm
--- old/Module-Install-1.19/lib/Module/Install/Run.pm   2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Run.pm   2023-04-27 
10:20:34.000000000 +0200
@@ -5,7 +5,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install::Base';
        $ISCORE  = 1;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/Scripts.pm 
new/Module-Install-1.21/lib/Module/Install/Scripts.pm
--- old/Module-Install-1.19/lib/Module/Install/Scripts.pm       2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Scripts.pm       2023-04-27 
10:20:34.000000000 +0200
@@ -5,7 +5,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install::Base';
        $ISCORE  = 1;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/Share.pm 
new/Module-Install-1.21/lib/Module/Install/Share.pm
--- old/Module-Install-1.19/lib/Module/Install/Share.pm 2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Share.pm 2023-04-27 
10:20:34.000000000 +0200
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install::Base';
        $ISCORE  = 1;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/Win32.pm 
new/Module-Install-1.21/lib/Module/Install/Win32.pm
--- old/Module-Install-1.19/lib/Module/Install/Win32.pm 2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/Win32.pm 2023-04-27 
10:20:34.000000000 +0200
@@ -5,7 +5,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install::Base';
        $ISCORE  = 1;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/With.pm 
new/Module-Install-1.21/lib/Module/Install/With.pm
--- old/Module-Install-1.19/lib/Module/Install/With.pm  2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/With.pm  2023-04-27 
10:20:34.000000000 +0200
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Module::Install::Base';
        $ISCORE  = 1;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install/WriteAll.pm 
new/Module-Install-1.21/lib/Module/Install/WriteAll.pm
--- old/Module-Install-1.19/lib/Module/Install/WriteAll.pm      2017-04-04 
21:30:43.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install/WriteAll.pm      2023-04-27 
10:20:34.000000000 +0200
@@ -5,7 +5,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = qw{Module::Install::Base};
        $ISCORE  = 1;
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/Module/Install.pm 
new/Module-Install-1.21/lib/Module/Install.pm
--- old/Module-Install-1.19/lib/Module/Install.pm       2017-08-20 
01:52:26.000000000 +0200
+++ new/Module-Install-1.21/lib/Module/Install.pm       2023-04-27 
10:20:34.000000000 +0200
@@ -30,7 +30,7 @@
        # This is not enforced yet, but will be some time in the next few
        # releases once we can make sure it won't clash with custom
        # Module::Install extensions.
-       $VERSION = '1.19';
+       $VERSION = '1.21';
 
        # Storage for the pseudo-singleton
        $MAIN    = undef;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/inc/Module/Install/DSL.pm 
new/Module-Install-1.21/lib/inc/Module/Install/DSL.pm
--- old/Module-Install-1.19/lib/inc/Module/Install/DSL.pm       2017-12-20 
00:28:01.000000000 +0100
+++ new/Module-Install-1.21/lib/inc/Module/Install/DSL.pm       1970-01-01 
01:00:00.000000000 +0100
@@ -1,108 +0,0 @@
-package inc::Module::Install::DSL;
-
-# This module ONLY loads if the user has manually installed their own
-# installation of Module::Install, and are some form of MI author.
-#
-# It runs from the installed location, and is never bundled
-# along with the other bundled modules.
-#
-# So because the version of this differs from the version that will
-# be bundled almost every time, it doesn't have it's own version and
-# isn't part of the synchronisation-checking.
-
-use strict;
-use vars qw{$VERSION};
-BEGIN {
-       # While this version will be overwritten when Module::Install
-       # loads, it remains so Module::Install itself can detect which
-       # version an author currently has installed.
-       # This allows it to implement any back-compatibility features
-       # it may want or need to.
-       $VERSION = '1.19';
-}
-
-if ( -d './inc' ) {
-       my $author = $^O eq 'VMS' ? './inc/_author' : './inc/.author';
-       if ( -d $author ) {
-               $Module::Install::AUTHOR = 1;
-               require File::Path;
-               File::Path::rmtree('inc');
-       }
-} else {
-       $Module::Install::AUTHOR = 1;
-}
-
-unshift @INC, 'inc' unless $INC[0] eq 'inc';
-require inc::Module::Install;
-require Module::Install::DSL;
-
-# Tie our import to the main one
-sub import {
-       goto &Module::Install::DSL::import;
-}
-
-1;
-
-=pod
-
-=head1 NAME
-
-inc::Module::Install::DSL - Domain Specific Language for Module::Install
-
-=head1 SYNOPSIS
-
-  use inc::Module::Install::DSL 0.80;
-  
-  all_from       lib/ADAMK/Repository.pm
-  requires       File::Spec            3.29
-  requires       File::pushd           1.00
-  requires       File::Find::Rule      0.30
-  requires       File::Find::Rule::VCS 1.05
-  requires       File::Flat            0
-  requires       File::Remove          1.42
-  requires       IPC::Run3             0.034
-  requires       Object::Tiny          1.06
-  requires       Params::Util          0.35
-  requires       CPAN::Version         5.5
-  test_requires  Test::More            0.86
-  test_requires  Test::Deep            1.03
-  install_script adamk
-  
-  requires_external_bin svn
-
-=head1 DESCRIPTION
-
-One of the primary design goals of L<Module::Install> is to simplify
-the creation of F<Makefile.PL> scripts.
-
-Part of this involves the gradual reduction of any and all superfluous
-characters, with the ultimate goal of requiring no non-critical
-information in the file.
-
-L<Module::Install::DSL> is a simple B<Domain Specific Language> based
-on the already-lightweight L<Module::Install> command syntax.
-
-The DSL takes one command on each line, and then wraps the command
-(and its parameters) with the normal quotes and semi-colons etc to
-turn it into Perl code.
-
-=head1 SUPPORT
-
-Bugs should be reported via the CPAN bug tracker at
-
-L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Module-Install>
-
-For other issues contact the author.
-
-=head1 AUTHORS
-
-Adam Kennedy E<lt>ad...@cpan.orge<gt>
-
-=head1 COPYRIGHT
-
-Copyright 2008 - 2012 Adam Kennedy.
-
-This program is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself.
-
-=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/lib/inc/Module/Install.pm 
new/Module-Install-1.21/lib/inc/Module/Install.pm
--- old/Module-Install-1.19/lib/inc/Module/Install.pm   2017-12-19 
06:19:11.000000000 +0100
+++ new/Module-Install-1.21/lib/inc/Module/Install.pm   2023-04-27 
10:20:34.000000000 +0200
@@ -18,7 +18,7 @@
        # version an author currently has installed.
        # This allows it to implement any back-compatibility features
        # it may want or need to.
-       $VERSION = '1.19';
+       $VERSION = '1.21';
 }
 
 if ( -d './inc' ) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/t/01_compile.t 
new/Module-Install-1.21/t/01_compile.t
--- old/Module-Install-1.19/t/01_compile.t      2017-12-20 00:28:01.000000000 
+0100
+++ new/Module-Install-1.21/t/01_compile.t      2023-04-27 10:20:34.000000000 
+0200
@@ -6,7 +6,7 @@
        $^W      = 1;
 }
 
-use Test::More tests => 68;
+use Test::More tests => 66;
 
 # Check their perl version
 ok( $] >= 5.005, "Your perl is new enough" );
@@ -23,7 +23,6 @@
        Module::Install::Can
        Module::Install::Compiler
        Module::Install::Deprecated
-       Module::Install::DSL
        Module::Install::External
        Module::Install::Fetch
        Module::Install::Include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/t/08_dsl.t 
new/Module-Install-1.21/t/08_dsl.t
--- old/Module-Install-1.19/t/08_dsl.t  2017-12-20 00:28:01.000000000 +0100
+++ new/Module-Install-1.21/t/08_dsl.t  1970-01-01 01:00:00.000000000 +0100
@@ -1,80 +0,0 @@
-# Tests for Module::Install::DSL
-
-use strict;
-BEGIN {
-       $|  = 1;
-       $^W = 1;
-}
-
-use Test::More tests => 8;
-use lib 't/lib';
-use MyTest;
-
-# Load the DSL module
-require_ok( 'inc::Module::Install::DSL' );
-
-# Generate code from a simple dsl block
-my $code = Module::Install::DSL::dsl2code(<<'END_DSL');
-all_from lib/My/Module.pm
-requires perl 5.008
-requires Carp 0
-requires Win32 if win32
-test_requires Test::More
-install_share
-END_DSL
-
-is( $code, <<'END_PERL', 'dsl2code generates the expected code' );
-all_from 'lib/My/Module.pm';
-requires 'perl', '5.008';
-requires 'Carp', '0';
-requires 'Win32' if win32;
-test_requires 'Test::More';
-install_share;
-END_PERL
-
-
-
-
-
-######################################################################
-# Automatic dynamic vs static detection
-
-# Automatically set static_config if there are no conditionals
-my $static = Module::Install::DSL::dsl2code(<<'END_DSL');
-all_from lib/My/Module.pm
-requires perl 5.008
-requires Carp 0
-requires Win32
-test_requires Test::More
-install_share
-END_DSL
-
-is( $static, <<'END_PERL', 'dsl2code generates the expected code' );
-all_from 'lib/My/Module.pm';
-requires 'perl', '5.008';
-requires 'Carp', '0';
-requires 'Win32';
-test_requires 'Test::More';
-install_share;
-static_config;
-END_PERL
-
-
-
-
-
-#####################################################################
-# Full scan dist run
-
-ok( create_dist( 'Foo', { 'Makefile.PL' => <<"END_DSL" }), 'create_dist' );
-use inc::Module::Install::DSL 0.81;
-name          Foo
-version       0.01
-license       perl
-requires_from lib/Foo.pm
-requires      File::Spec   0.79
-END_DSL
-ok( build_dist(), 'build_dist' );
-ok( -f makefile() );
-ok( -f file('META.yml') );
-ok( kill_dist(), 'kill_dist' );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/Module-Install-1.19/t/lib/MyTest.pm 
new/Module-Install-1.21/t/lib/MyTest.pm
--- old/Module-Install-1.19/t/lib/MyTest.pm     2017-04-04 21:30:43.000000000 
+0200
+++ new/Module-Install-1.21/t/lib/MyTest.pm     2023-04-27 10:20:34.000000000 
+0200
@@ -9,7 +9,7 @@
 
 use vars qw{$VERSION @ISA @EXPORT $DIST};
 BEGIN {
-       $VERSION = '1.19';
+       $VERSION = '1.21';
        @ISA     = 'Exporter';
        @EXPORT  = qw{
                create_dist

Reply via email to