diff --git a/ExtUtils-MakeMaker-6.62.tar.gz b/ExtUtils-MakeMaker-6.62.tar.gz deleted file mode 100644 index c719634..0000000 --- a/ExtUtils-MakeMaker-6.62.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63cd6538e4fa1e2425ec24e9b46c1a446e1ddc91f2a54fea7fbdbbf705f35378 -size 415020 diff --git a/ExtUtils-MakeMaker-6.64.tar.gz b/ExtUtils-MakeMaker-6.64.tar.gz new file mode 100644 index 0000000..20b398f --- /dev/null +++ b/ExtUtils-MakeMaker-6.64.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cbfa2aee5e82fa885b841d2be8b2ce7334e06276d32f8fea6da392b28d37fbb +size 421787 diff --git a/fix-provides.diff b/fix-provides.diff index 2f5790e..217ca02 100644 --- a/fix-provides.diff +++ b/fix-provides.diff @@ -1,7 +1,7 @@ -Index: ExtUtils-MakeMaker-6.62/blib/lib/ExtUtils/Mkbootstrap.pm +Index: lib/ExtUtils/Mkbootstrap.pm =================================================================== ---- ExtUtils-MakeMaker-6.62.orig/lib/ExtUtils/Mkbootstrap.pm 2011-10-24 01:44:11.000000000 +0200 -+++ ExtUtils-MakeMaker-6.62/lib/ExtUtils/Mkbootstrap.pm 2012-02-16 13:29:03.374818889 +0100 +--- lib/ExtUtils/Mkbootstrap.pm.orig ++++ lib/ExtUtils/Mkbootstrap.pm @@ -31,7 +31,8 @@ sub Mkbootstrap { if (-f "${baseext}_BS"){ @@ -22,10 +22,10 @@ Index: ExtUtils-MakeMaker-6.62/blib/lib/ExtUtils/Mkbootstrap.pm push(@dl_resolve_using, dl_findfile('-lc')); } -Index: ExtUtils-MakeMaker-6.62/Makefile.PL +Index: Makefile.PL =================================================================== ---- ExtUtils-MakeMaker-6.62.orig/Makefile.PL 2011-09-25 07:17:37.000000000 +0200 -+++ ExtUtils-MakeMaker-6.62/Makefile.PL 2012-02-16 13:23:46.951720554 +0100 +--- Makefile.PL.orig ++++ Makefile.PL @@ -11,7 +11,6 @@ BEGIN { require 5.006; } use strict; @@ -34,16 +34,17 @@ Index: ExtUtils-MakeMaker-6.62/Makefile.PL use lib qw(lib); # build ourself with ourself -@@ -51,8 +50,6 @@ $prereq{'Test::Harness'} = 2.00 if $^O e +@@ -70,9 +69,6 @@ if( $BUILDING_AS_PACKAGE ) { - check_environment(); + $Extra_Prereqs{'JSON::PP::Compat5006'} = '1.09' if $] < 5.008; + } +-else { +- my::bundles::copy_bundles("bundled", "inc"); +-} --my::bundles::copy_bundles("bundled", "inc"); -- - my $MM = WriteMakefile( - NAME => $PACKAGE, - VERSION_FROM => "lib/$PACKAGE_FILE.pm", # finds $VERSION -@@ -73,7 +70,6 @@ my $MM = WriteMakefile( + # Test::Harnesses prior to 2.00 shoved all of @INC onto the command line + # when a test had -T. This made it too long. So we need a Test::Harness +@@ -99,7 +95,6 @@ my $MM = WriteMakefile( META_MERGE => { no_index => { package => [ 'DynaLoader', 'in' ], # "in" is a PAUSE misparse. @@ -51,11 +52,11 @@ Index: ExtUtils-MakeMaker-6.62/Makefile.PL }, resources => { license => 'http://dev.perl.org/licenses/', -Index: ExtUtils-MakeMaker-6.62/MANIFEST +Index: MANIFEST =================================================================== ---- ExtUtils-MakeMaker-6.62.orig/MANIFEST 2011-10-24 01:47:10.000000000 +0200 -+++ ExtUtils-MakeMaker-6.62/MANIFEST 2012-02-16 13:24:07.363759353 +0100 -@@ -1,33 +1,4 @@ +--- MANIFEST.orig ++++ MANIFEST +@@ -1,34 +1,4 @@ bin/instmodsh -bundled/CPAN-Meta-YAML/CPAN/Meta/YAML.pm -bundled/CPAN-Meta/CPAN/Meta.pm @@ -77,6 +78,7 @@ Index: ExtUtils-MakeMaker-6.62/MANIFEST -bundled/JSON-PP/JSON/PP.pm -bundled/JSON-PP/JSON/PP/Boolean.pm -bundled/Parse-CPAN-Meta/Parse/CPAN/Meta.pm +-bundled/README -bundled/Scalar-List-Utils/List/Util.pm -bundled/Scalar-List-Utils/List/Util/PP.pm -bundled/Scalar-List-Utils/Scalar/Util.pm diff --git a/perl-ExtUtils-MakeMaker.changes b/perl-ExtUtils-MakeMaker.changes index 16fd1fc..4f8b86b 100644 --- a/perl-ExtUtils-MakeMaker.changes +++ b/perl-ExtUtils-MakeMaker.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 25 18:46:29 UTC 2013 - chris@computersalat.de + +- update to 6.64 + * Update the home page in the meta file. makemaker.org has been + unmaintained for a while. +- fix deps for building on SLE_11 +- rebase provides patch + ------------------------------------------------------------------- Thu Feb 16 12:35:04 UTC 2012 - coolo@suse.com diff --git a/perl-ExtUtils-MakeMaker.spec b/perl-ExtUtils-MakeMaker.spec index 8c7efed..472550e 100644 --- a/perl-ExtUtils-MakeMaker.spec +++ b/perl-ExtUtils-MakeMaker.spec @@ -1,7 +1,7 @@ # # spec file for package perl-ExtUtils-MakeMaker # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products 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,7 +17,7 @@ Name: perl-ExtUtils-MakeMaker -Version: 6.62 +Version: 6.64 Release: 0 %define cpan_name ExtUtils-MakeMaker Summary: Create a module Makefile @@ -33,19 +33,30 @@ BuildRequires: perl BuildRequires: perl-macros # MANUAL BEGIN #!BuildIgnore: perl-ExtUtils-MakeMaker -BuildRequires: perl(CPAN::Meta) >= 2.112150 BuildRequires: perl-CPAN-Meta BuildRequires: perl-File-Copy-Recursive +BuildRequires: perl(Data::Dumper) # MANUAL END +# Extra_Prereqs for being built as vendor pkg +BuildRequires: perl(CPAN::Meta) >= 2.112580 +BuildRequires: perl(CPAN::Meta::YAML) >= 0.002 +BuildRequires: perl(ExtUtils::Command) >= 1.16 +BuildRequires: perl(ExtUtils::Install) >= 1.52 +BuildRequires: perl(ExtUtils::Manifest) >= 1.58 +BuildRequires: perl(File::Temp) >= 0.22 +BuildRequires: perl(JSON::PP) >= 2.27103 +BuildRequires: perl(Parse::CPAN::Meta) >= 1.4400 +BuildRequires: perl(Scalar::Util) >= 1.13 +BuildRequires: perl(Version::Requirements) >= 0.101020 +BuildRequires: perl(version) >= 0.82 +# #BuildRequires: perl(CPAN::Meta) #BuildRequires: perl(CPAN::Meta::Converter) #BuildRequires: perl(CPAN::Meta::Feature) #BuildRequires: perl(CPAN::Meta::Prereqs) #BuildRequires: perl(CPAN::Meta::Validator) -#BuildRequires: perl(CPAN::Meta::YAML) #BuildRequires: perl(ExtUtils::CBuilder) #BuildRequires: perl(I::Do::Not::Exist) -#BuildRequires: perl(JSON::PP) #BuildRequires: perl(List::Util::PP) #BuildRequires: perl(MakeMaker::Test::NoXS) #BuildRequires: perl(MakeMaker::Test::Setup::BFD) @@ -57,13 +68,9 @@ BuildRequires: perl-File-Copy-Recursive #BuildRequires: perl(MakeMaker::Test::Setup::XS) #BuildRequires: perl(MakeMaker::Test::Utils) #BuildRequires: perl(my::bundles) -#BuildRequires: perl(Parse::CPAN::Meta) -#BuildRequires: perl(Scalar::Util::PP) #BuildRequires: perl(Test::Builder::IO::Scalar) #BuildRequires: perl(TieIn) #BuildRequires: perl(TieOut) -#BuildRequires: perl(version) -#BuildRequires: perl(Version::Requirements) >= 0.101020 #BuildRequires: perl(VMS::Feature) #BuildRequires: perl(Win32API::File) #BuildRequires: perl(YAML) @@ -87,7 +94,7 @@ of WriteMakefile(). %prep %setup -q -n %{cpan_name}-%{version} # MANUAL BEGIN -%patch0 -p1 +%patch0 rm -rf bundled # MANAUL END find . -type f -print0 | xargs -0 chmod 644