commit perl-strictures for openSUSE:Factory

17 Sep 2014

Hello community,

here is the log from the commit of package perl-strictures for openSUSE:Factory checked in at 2014-09-17 17:26:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-strictures (Old)
 and      /work/SRC/openSUSE:Factory/.perl-strictures.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "perl-strictures"

Changes:
--------

--- /work/SRC/openSUSE:Factory/perl-strictures/perl-strictures.changes	2014-03-02 07:43:06.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.perl-strictures.new/perl-strictures.changes	2014-09-17 17:26:33.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Sep 16 08:07:55 UTC 2014 - coolo@suse.com
+
+- updated to 1.005005
+  - include minimum perl version in metadata
+  - make sure meta files list extra modules as recommendations, not requirements
+
+-------------------------------------------------------------------

Old:
----
  strictures-1.005003.tar.gz

New:
----
  strictures-1.005005.tar.gz

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

Other differences:
------------------
++++++ perl-strictures.spec ++++++
--- /var/tmp/diff_new_pack.dBPF8N/_old	2014-09-17 17:26:34.000000000 +0200
+++ /var/tmp/diff_new_pack.dBPF8N/_new	2014-09-17 17:26:34.000000000 +0200
@@ -17,10 +17,10 @@
 
 
 Name:           perl-strictures
-Version:        1.005003
+Version:        1.005005
 Release:        0
 %define cpan_name strictures
-Summary:        turn on strict and make all warnings fatal
+Summary:        Turn on strict and make all warnings fatal
 License:        Artistic-1.0 or GPL-1.0+
 Group:          Development/Libraries/Perl
 Url:            http://search.cpan.org/dist/strictures/
@@ -29,13 +29,15 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  perl
 BuildRequires:  perl-macros
-BuildRequires:  perl(ExtUtils::CBuilder)
 BuildRequires:  perl(bareword::filehandles)
 BuildRequires:  perl(indirect)
 BuildRequires:  perl(multidimensional)
 Requires:       perl(bareword::filehandles)
 Requires:       perl(indirect)
 Requires:       perl(multidimensional)
+Recommends:     perl(bareword::filehandles)
+Recommends:     perl(indirect)
+Recommends:     perl(multidimensional)
 %{perl_requires}
 
 %description

++++++ strictures-1.005003.tar.gz -> strictures-1.005005.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005003/Changes new/strictures-1.005005/Changes
--- old/strictures-1.005003/Changes	2014-02-12 23:01:53.000000000 +0100
+++ new/strictures-1.005005/Changes	2014-08-16 03:16:45.000000000 +0200
@@ -1,5 +1,11 @@
 Release history for strictures
 
+1.005005 - 2014-08-16
+  - include minimum perl version in metadata
+
+1.005004 - 2014-03-06
+  - make sure meta files list extra modules as recommendations, not requirements
+
 1.005003 - 2014-02-12
   - added support for PUREPERL_ONLY (rt#91407)
   - fixed using strictures->VERSION to query the version (rt#92965)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005003/META.json new/strictures-1.005005/META.json
--- old/strictures-1.005003/META.json	2014-02-12 23:02:02.000000000 +0100
+++ new/strictures-1.005005/META.json	2014-08-16 03:16:54.000000000 +0200
@@ -4,7 +4,7 @@
       "mst - Matt S. Trout (cpan:MSTROUT) <mst@shadowcat.co.uk>"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "ExtUtils::MakeMaker version 6.86, CPAN::Meta::Converter version 2.133380",
+   "generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.141520",
    "license" : [
       "perl_5"
    ],
@@ -16,28 +16,37 @@
    "no_index" : {
       "directory" : [
          "t",
-         "inc"
+         "xt"
       ]
    },
    "prereqs" : {
       "build" : {
-         "requires" : {
-            "ExtUtils::MakeMaker" : "0"
-         }
+         "requires" : {}
       },
       "configure" : {
+         "requires" : {}
+      },
+      "develop" : {
          "requires" : {
-            "ExtUtils::CBuilder" : "0",
-            "ExtUtils::MakeMaker" : "0"
+            "bareword::filehandles" : "0",
+            "indirect" : "0",
+            "multidimensional" : "0"
          }
       },
       "runtime" : {
-         "requires" : {
+         "recommends" : {
             "bareword::filehandles" : "0",
             "indirect" : "0",
-            "multidimensional" : "0",
+            "multidimensional" : "0"
+         },
+         "requires" : {
             "perl" : "5.006"
          }
+      },
+      "test" : {
+         "requires" : {
+            "Test::More" : "0"
+         }
       }
    },
    "release_status" : "stable",
@@ -46,11 +55,14 @@
          "mailto" : "bug-strictures@rt.cpan.org",
          "web" : "https://rt.cpan.org/Public/Dist/Display.html?Name=strictures"
       },
+      "license" : [
+         "http://dev.perl.org/licenses/"
+      ],
       "repository" : {
          "type" : "git",
          "url" : "git://git.shadowcat.co.uk/p5sagit/strictures.git",
          "web" : "http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git"
       }
    },
-   "version" : "1.005003"
+   "version" : "1.005005"
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005003/META.yml new/strictures-1.005005/META.yml
--- old/strictures-1.005003/META.yml	2014-02-12 23:02:02.000000000 +0100
+++ new/strictures-1.005005/META.yml	2014-08-16 03:16:54.000000000 +0200
@@ -3,27 +3,27 @@
 author:
   - 'mst - Matt S. Trout (cpan:MSTROUT) <mst@shadowcat.co.uk>'
 build_requires:
-  ExtUtils::MakeMaker: 0
-configure_requires:
-  ExtUtils::CBuilder: 0
-  ExtUtils::MakeMaker: 0
+  Test::More: '0'
+configure_requires: {}
 dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 6.86, CPAN::Meta::Converter version 2.133380'
+generated_by: 'ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.141520'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: 1.4
+  version: '1.4'
 name: strictures
 no_index:
   directory:
     - t
-    - inc
+    - xt
+recommends:
+  bareword::filehandles: '0'
+  indirect: '0'
+  multidimensional: '0'
 requires:
-  bareword::filehandles: 0
-  indirect: 0
-  multidimensional: 0
-  perl: 5.006
+  perl: '5.006'
 resources:
   bugtracker: https://rt.cpan.org/Public/Dist/Display.html?Name=strictures
+  license: http://dev.perl.org/licenses/
   repository: git://git.shadowcat.co.uk/p5sagit/strictures.git
-version: 1.005003
+version: '1.005005'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005003/Makefile.PL new/strictures-1.005005/Makefile.PL
--- old/strictures-1.005003/Makefile.PL	2014-02-12 19:59:33.000000000 +0100
+++ new/strictures-1.005005/Makefile.PL	2014-08-12 09:50:11.000000000 +0200
@@ -1,8 +1,11 @@
 use strict;
 use warnings FATAL => 'all';
-use ExtUtils::MakeMaker;
+use 5.006;
 
-(do 'maint/Makefile.PL.include' or die $@) unless -f 'META.yml';
+my $have_compiler
+  = ! parse_args()->{PUREPERL_ONLY}
+  &&  eval { require ExtUtils::CBuilder; 1 }
+  && ExtUtils::CBuilder->new->have_compiler;
 
 my %extra_prereqs = (
   indirect => 0,
@@ -10,9 +13,56 @@
   'bareword::filehandles' => 0,
 );
 
-use Text::ParseWords;
+my %META = (
+  name => 'strictures',
+  license => 'perl_5',
+  prereqs => {
+    configure => { requires => { } },
+    build => { requires => { } },
+    test => { requires => {
+      'Test::More' => 0,
+    } },
+    runtime => {
+      requires => {
+        perl => '5.006',
+      },
+      recommends => {
+        %extra_prereqs,
+      },
+    },
+    develop => { requires => {
+      %extra_prereqs,
+    } },
+  },
+  resources => {
+    # r/w: p5sagit@git.shadowcat.co.uk:strictures.git
+    repository => {
+      url => 'git://git.shadowcat.co.uk/p5sagit/strictures.git',
+      web => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git',
+      type => 'git',
+    },
+    bugtracker => {
+      mailto => 'bug-strictures@rt.cpan.org',
+      web => 'https://rt.cpan.org/Public/Dist/Display.html?Name=strictures',
+    },
+    license => [ 'http://dev.perl.org/licenses/' ],
+  },
+  no_index => {
+    directory => [ 't', 'xt' ]
+  },
+);
+
+my %MM_ARGS = (
+  PREREQ_PM => {
+    ($] >= 5.008004 && $have_compiler ? %extra_prereqs : () )
+  },
+  realclean => { FILES => [ 'Distar/', 'MANIFEST*' ] },
+);
+
 sub parse_args {
   # copied from EUMM
+  require ExtUtils::MakeMaker;
+  require Text::ParseWords;
   ExtUtils::MakeMaker::parse_args(
     my $tmp = {},
     Text::ParseWords::shellwords($ENV{PERL_MM_OPT} || ''),
@@ -21,46 +71,42 @@
   return $tmp->{ARGS} || {};
 }
 
-my $have_compiler
-  = ! parse_args()->{PUREPERL_ONLY}
-  &&  eval { require ExtUtils::CBuilder; 1 }
-  && ExtUtils::CBuilder->new->have_compiler;
+##############################################################################
+require ExtUtils::MakeMaker;
+(do 'maint/Makefile.PL.include' or die $@) unless -f 'META.yml';
 
-WriteMakefile(
-  NAME => 'strictures',
-  VERSION_FROM => 'lib/strictures.pm',
-  MIN_PERL_VERSION => '5.006',
-
-  META_MERGE => {
-    'meta-spec' => { version => 2 },
-    dynamic_config => 1,
-
-    resources => {
-      # r/w: p5sagit@git.shadowcat.co.uk:strictures.git
-      repository => {
-        url => 'git://git.shadowcat.co.uk/p5sagit/strictures.git',
-        web => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git',
-        type => 'git',
-      },
-      bugtracker => {
-          mailto => 'bug-strictures@rt.cpan.org',
-          web => 'https://rt.cpan.org/Public/Dist/Display.html?Name=strictures',
-      },
-    },
+# 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;
+$MM_ARGS{LICENSE} = $META{license}
+  if $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';
+  my $r = $MM_ARGS{$key} = {
+    %{$META{prereqs}{$_}{requires} || {}},
+    %{delete $MM_ARGS{$key} || {}},
+  };
+  defined $r->{$_} or delete $r->{$_} for keys %$r;
+}
 
-    prereqs => {
-      configure => {
-        requires => {
-          'ExtUtils::CBuilder' => 0,
-        },
-      },
-      runtime => {
-        ( $] >= 5.008004 && !$have_compiler
-          ? ( recommends => \%extra_prereqs ) : () ),
-      },
-    },
-  },
+$MM_ARGS{MIN_PERL_VERSION} = delete $MM_ARGS{PREREQ_PM}{perl} || 0;
 
-  ($] >= 5.008004 && $have_compiler
-    ? ( PREREQ_PM => \%extra_prereqs ) : () ),
-);
+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;
+
+ExtUtils::MakeMaker::WriteMakefile(%MM_ARGS);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005003/lib/strictures.pm new/strictures-1.005005/lib/strictures.pm
--- old/strictures-1.005003/lib/strictures.pm	2014-02-12 23:00:22.000000000 +0100
+++ new/strictures-1.005005/lib/strictures.pm	2014-08-16 03:16:14.000000000 +0200
@@ -7,7 +7,7 @@
   *_PERL_LT_5_8_4 = ($] < 5.008004) ? sub(){1} : sub(){0};
 }
 
-our $VERSION = '1.005003'; # 1.5.3
+our $VERSION = '1.005005';
 
 sub VERSION {
   my ($class, $version) = @_;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/strictures-1.005003/maint/bump-version new/strictures-1.005005/maint/bump-version
--- old/strictures-1.005003/maint/bump-version	2013-09-18 08:11:53.000000000 +0200
+++ new/strictures-1.005005/maint/bump-version	2014-08-16 03:15:28.000000000 +0200
@@ -7,9 +7,10 @@
 
 chomp(my $LATEST = qx(grep '^[0-9]' Changes | head -1 | awk '{print \$1}'));
 
-my @parts = split /\./, $LATEST;
+my @parts = map { m/(\d{1,3})/g } split /\./, $LATEST;
+push @parts, 0, 0;
 
-my $OLD_DECIMAL = sprintf('%i.%03i%03i', @parts);
+my $OLD_DECIMAL = sprintf('%i.%03i%03i', @parts[0..2]);
 
 my %bump_part = (major => 0, minor => 1, bugfix => 2);
 
@@ -21,16 +22,18 @@
 
 $new_parts[$bump_this]++;
 
-my $NEW_DECIMAL = sprintf('%i.%03i%03i', @new_parts);
+my $NEW_DECIMAL = sprintf('%i.%03i%03i', @new_parts[0..2]);
 
-warn "Bumping $OLD_DECIMAL -> $NEW_DECIMAL\n";
+my @PM_FILES = ( 'lib/strictures.pm' );
 
-my $PM_FILE = 'lib/Module/Metadata.pm';
+foreach my $filename (@PM_FILES) {
+  warn "Bumping $OLD_DECIMAL -> $NEW_DECIMAL in $filename\n";
 
-my $file = do { local (@ARGV, $/) = ($PM_FILE); <> };
+  my $file = do { local (@ARGV, $/) = ($filename); <> };
 
-$file =~ s/(?<=\$VERSION = ')${\quotemeta $OLD_DECIMAL}/${NEW_DECIMAL}/;
+  $file =~ s/(?<=\$VERSION = ')${\quotemeta $OLD_DECIMAL}/${NEW_DECIMAL}/;
 
-open my $out, '>', $PM_FILE;
+  open my $out, '>', $filename;
 
-print $out $file;
+  print $out $file;
+}

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)