Accepting request 149956 from home:computersalat:devel:perl

update to 6.64

OBS-URL: https://build.opensuse.org/request/show/149956
OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-ExtUtils-MakeMaker?expand=0&rev=17
This commit is contained in:
Christian Wittmer 2013-01-25 19:24:20 +00:00 committed by Git OBS Bridge
parent 491d3ffabc
commit a16f8d284e
5 changed files with 49 additions and 31 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:63cd6538e4fa1e2425ec24e9b46c1a446e1ddc91f2a54fea7fbdbbf705f35378
size 415020

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1cbfa2aee5e82fa885b841d2be8b2ce7334e06276d32f8fea6da392b28d37fbb
size 421787

View File

@ -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 --- lib/ExtUtils/Mkbootstrap.pm.orig
+++ ExtUtils-MakeMaker-6.62/lib/ExtUtils/Mkbootstrap.pm 2012-02-16 13:29:03.374818889 +0100 +++ lib/ExtUtils/Mkbootstrap.pm
@@ -31,7 +31,8 @@ sub Mkbootstrap { @@ -31,7 +31,8 @@ sub Mkbootstrap {
if (-f "${baseext}_BS"){ 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')); 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 --- Makefile.PL.orig
+++ ExtUtils-MakeMaker-6.62/Makefile.PL 2012-02-16 13:23:46.951720554 +0100 +++ Makefile.PL
@@ -11,7 +11,6 @@ BEGIN { require 5.006; } @@ -11,7 +11,6 @@ BEGIN { require 5.006; }
use strict; use strict;
@ -34,16 +34,17 @@ Index: ExtUtils-MakeMaker-6.62/Makefile.PL
use lib qw(lib); # build ourself with ourself 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"); # 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
my $MM = WriteMakefile( @@ -99,7 +95,6 @@ my $MM = WriteMakefile(
NAME => $PACKAGE,
VERSION_FROM => "lib/$PACKAGE_FILE.pm", # finds $VERSION
@@ -73,7 +70,6 @@ my $MM = WriteMakefile(
META_MERGE => { META_MERGE => {
no_index => { no_index => {
package => [ 'DynaLoader', 'in' ], # "in" is a PAUSE misparse. package => [ 'DynaLoader', 'in' ], # "in" is a PAUSE misparse.
@ -51,11 +52,11 @@ Index: ExtUtils-MakeMaker-6.62/Makefile.PL
}, },
resources => { resources => {
license => 'http://dev.perl.org/licenses/', 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 --- MANIFEST.orig
+++ ExtUtils-MakeMaker-6.62/MANIFEST 2012-02-16 13:24:07.363759353 +0100 +++ MANIFEST
@@ -1,33 +1,4 @@ @@ -1,34 +1,4 @@
bin/instmodsh bin/instmodsh
-bundled/CPAN-Meta-YAML/CPAN/Meta/YAML.pm -bundled/CPAN-Meta-YAML/CPAN/Meta/YAML.pm
-bundled/CPAN-Meta/CPAN/Meta.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.pm
-bundled/JSON-PP/JSON/PP/Boolean.pm -bundled/JSON-PP/JSON/PP/Boolean.pm
-bundled/Parse-CPAN-Meta/Parse/CPAN/Meta.pm -bundled/Parse-CPAN-Meta/Parse/CPAN/Meta.pm
-bundled/README
-bundled/Scalar-List-Utils/List/Util.pm -bundled/Scalar-List-Utils/List/Util.pm
-bundled/Scalar-List-Utils/List/Util/PP.pm -bundled/Scalar-List-Utils/List/Util/PP.pm
-bundled/Scalar-List-Utils/Scalar/Util.pm -bundled/Scalar-List-Utils/Scalar/Util.pm

View File

@ -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 Thu Feb 16 12:35:04 UTC 2012 - coolo@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package perl-ExtUtils-MakeMaker # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: perl-ExtUtils-MakeMaker Name: perl-ExtUtils-MakeMaker
Version: 6.62 Version: 6.64
Release: 0 Release: 0
%define cpan_name ExtUtils-MakeMaker %define cpan_name ExtUtils-MakeMaker
Summary: Create a module Makefile Summary: Create a module Makefile
@ -33,19 +33,30 @@ BuildRequires: perl
BuildRequires: perl-macros BuildRequires: perl-macros
# MANUAL BEGIN # MANUAL BEGIN
#!BuildIgnore: perl-ExtUtils-MakeMaker #!BuildIgnore: perl-ExtUtils-MakeMaker
BuildRequires: perl(CPAN::Meta) >= 2.112150
BuildRequires: perl-CPAN-Meta BuildRequires: perl-CPAN-Meta
BuildRequires: perl-File-Copy-Recursive BuildRequires: perl-File-Copy-Recursive
BuildRequires: perl(Data::Dumper)
# MANUAL END # 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)
#BuildRequires: perl(CPAN::Meta::Converter) #BuildRequires: perl(CPAN::Meta::Converter)
#BuildRequires: perl(CPAN::Meta::Feature) #BuildRequires: perl(CPAN::Meta::Feature)
#BuildRequires: perl(CPAN::Meta::Prereqs) #BuildRequires: perl(CPAN::Meta::Prereqs)
#BuildRequires: perl(CPAN::Meta::Validator) #BuildRequires: perl(CPAN::Meta::Validator)
#BuildRequires: perl(CPAN::Meta::YAML)
#BuildRequires: perl(ExtUtils::CBuilder) #BuildRequires: perl(ExtUtils::CBuilder)
#BuildRequires: perl(I::Do::Not::Exist) #BuildRequires: perl(I::Do::Not::Exist)
#BuildRequires: perl(JSON::PP)
#BuildRequires: perl(List::Util::PP) #BuildRequires: perl(List::Util::PP)
#BuildRequires: perl(MakeMaker::Test::NoXS) #BuildRequires: perl(MakeMaker::Test::NoXS)
#BuildRequires: perl(MakeMaker::Test::Setup::BFD) #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::Setup::XS)
#BuildRequires: perl(MakeMaker::Test::Utils) #BuildRequires: perl(MakeMaker::Test::Utils)
#BuildRequires: perl(my::bundles) #BuildRequires: perl(my::bundles)
#BuildRequires: perl(Parse::CPAN::Meta)
#BuildRequires: perl(Scalar::Util::PP)
#BuildRequires: perl(Test::Builder::IO::Scalar) #BuildRequires: perl(Test::Builder::IO::Scalar)
#BuildRequires: perl(TieIn) #BuildRequires: perl(TieIn)
#BuildRequires: perl(TieOut) #BuildRequires: perl(TieOut)
#BuildRequires: perl(version)
#BuildRequires: perl(Version::Requirements) >= 0.101020
#BuildRequires: perl(VMS::Feature) #BuildRequires: perl(VMS::Feature)
#BuildRequires: perl(Win32API::File) #BuildRequires: perl(Win32API::File)
#BuildRequires: perl(YAML) #BuildRequires: perl(YAML)
@ -87,7 +94,7 @@ of WriteMakefile().
%prep %prep
%setup -q -n %{cpan_name}-%{version} %setup -q -n %{cpan_name}-%{version}
# MANUAL BEGIN # MANUAL BEGIN
%patch0 -p1 %patch0
rm -rf bundled rm -rf bundled
# MANAUL END # MANAUL END
find . -type f -print0 | xargs -0 chmod 644 find . -type f -print0 | xargs -0 chmod 644