From 48b67dc6ccd93e36492d95acab87c9d0abbc63eb52459f3189d51dc1cd896fc4 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 26 Nov 2013 14:34:42 +0000 Subject: [PATCH] - updated to 6.82 Misc: * Special-case the bundling of version, so that XS versions don't get overwritten Doc fixes: * Update XSPROTOARG docs for changes in xsubpp * Clarify heir-apparent in FAQ Misc: * Changed GNU-Style to Unix-Style * VMS will now report 'make' style * Updated bundled JSON::PP * Updated bundled Test-Simple Bug fixes: * Add CP_NONEMPTY to the list of tools in Makefile * don't copy .bs portably :) * RT#28992 don't copy .bs files if they are empty New feature: * Made UNINST an attribute, so removing shadowed modules can be set 'perl Makefile.PL UNINST=1' Bug fixes: * do not set default switches in Test::Harness; not even -w OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-ExtUtils-MakeMaker?expand=0&rev=18 --- ExtUtils-MakeMaker-6.64.tar.gz | 3 -- ExtUtils-MakeMaker-6.82.tar.gz | 3 ++ fix-provides.diff | 20 +++++------ perl-ExtUtils-MakeMaker.changes | 29 ++++++++++++++++ perl-ExtUtils-MakeMaker.spec | 60 ++++++++++----------------------- 5 files changed, 59 insertions(+), 56 deletions(-) delete mode 100644 ExtUtils-MakeMaker-6.64.tar.gz create mode 100644 ExtUtils-MakeMaker-6.82.tar.gz diff --git a/ExtUtils-MakeMaker-6.64.tar.gz b/ExtUtils-MakeMaker-6.64.tar.gz deleted file mode 100644 index 20b398f..0000000 --- a/ExtUtils-MakeMaker-6.64.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cbfa2aee5e82fa885b841d2be8b2ce7334e06276d32f8fea6da392b28d37fbb -size 421787 diff --git a/ExtUtils-MakeMaker-6.82.tar.gz b/ExtUtils-MakeMaker-6.82.tar.gz new file mode 100644 index 0000000..63b1cd9 --- /dev/null +++ b/ExtUtils-MakeMaker-6.82.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb2b31b6764e2b81437d4f38a29135cc2779840dfd13c3313144995506cef376 +size 433809 diff --git a/fix-provides.diff b/fix-provides.diff index 217ca02..795bf1c 100644 --- a/fix-provides.diff +++ b/fix-provides.diff @@ -34,17 +34,16 @@ Index: Makefile.PL use lib qw(lib); # build ourself with ourself -@@ -70,9 +69,6 @@ if( $BUILDING_AS_PACKAGE ) { - - $Extra_Prereqs{'JSON::PP::Compat5006'} = '1.09' if $] < 5.008; +@@ -80,8 +79,6 @@ else { + if ( $@ ) { + $Extra_Params{PERL} = "$^X -Iinc"; + } +- +- my::bundles::copy_bundles("bundled", "inc"); } --else { -- 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 -@@ -99,7 +95,6 @@ my $MM = WriteMakefile( +@@ -109,7 +106,6 @@ my $MM = WriteMakefile( META_MERGE => { no_index => { package => [ 'DynaLoader', 'in' ], # "in" is a PAUSE misparse. @@ -56,7 +55,8 @@ Index: MANIFEST =================================================================== --- MANIFEST.orig +++ MANIFEST -@@ -1,34 +1,4 @@ +@@ -1,35 +1,5 @@ + .perlcriticrc bin/instmodsh -bundled/CPAN-Meta-YAML/CPAN/Meta/YAML.pm -bundled/CPAN-Meta/CPAN/Meta.pm @@ -64,6 +64,7 @@ Index: MANIFEST -bundled/CPAN-Meta/CPAN/Meta/Feature.pm -bundled/CPAN-Meta/CPAN/Meta/History.pm -bundled/CPAN-Meta/CPAN/Meta/Prereqs.pm +-bundled/CPAN-Meta/CPAN/Meta/Requirements.pm -bundled/CPAN-Meta/CPAN/Meta/Spec.pm -bundled/CPAN-Meta/CPAN/Meta/Validator.pm -bundled/ExtUtils-Command/ExtUtils/Command.pm @@ -83,7 +84,6 @@ Index: MANIFEST -bundled/Scalar-List-Utils/List/Util/PP.pm -bundled/Scalar-List-Utils/Scalar/Util.pm -bundled/Scalar-List-Utils/Scalar/Util/PP.pm --bundled/Version-Requirements/Version/Requirements.pm -bundled/version/version.pm -bundled/version/version.pod -bundled/version/version/Internals.pod diff --git a/perl-ExtUtils-MakeMaker.changes b/perl-ExtUtils-MakeMaker.changes index 4f8b86b..f9247f5 100644 --- a/perl-ExtUtils-MakeMaker.changes +++ b/perl-ExtUtils-MakeMaker.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Tue Nov 26 14:26:44 UTC 2013 - coolo@suse.com + +- updated to 6.82 + Misc: + * Special-case the bundling of version, so + that XS versions don't get overwritten + Doc fixes: + * Update XSPROTOARG docs for changes in xsubpp + * Clarify heir-apparent in FAQ + + Misc: + * Changed GNU-Style to Unix-Style + * VMS will now report 'make' style + * Updated bundled JSON::PP + * Updated bundled Test-Simple + + Bug fixes: + * Add CP_NONEMPTY to the list of tools in Makefile + * don't copy .bs portably :) + * RT#28992 don't copy .bs files if they are empty + + New feature: + * Made UNINST an attribute, so removing shadowed modules + can be set 'perl Makefile.PL UNINST=1' + + Bug fixes: + * do not set default switches in Test::Harness; not even -w + ------------------------------------------------------------------- Fri Jan 25 18:46:29 UTC 2013 - chris@computersalat.de diff --git a/perl-ExtUtils-MakeMaker.spec b/perl-ExtUtils-MakeMaker.spec index 472550e..5775e3c 100644 --- a/perl-ExtUtils-MakeMaker.spec +++ b/perl-ExtUtils-MakeMaker.spec @@ -17,65 +17,27 @@ Name: perl-ExtUtils-MakeMaker -Version: 6.64 +Version: 6.82 Release: 0 %define cpan_name ExtUtils-MakeMaker Summary: Create a module Makefile License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/ExtUtils-MakeMaker/ -Source: http://www.cpan.org/authors/id/M/MS/MSCHWERN/%{cpan_name}-%{version}.tar.gz +Source: http://www.cpan.org/authors/id/B/BI/BINGOS/%{cpan_name}-%{version}.tar.gz # MANUAL Patch0: fix-provides.diff BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros +%{perl_requires} # MANUAL BEGIN #!BuildIgnore: perl-ExtUtils-MakeMaker 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(ExtUtils::CBuilder) -#BuildRequires: perl(I::Do::Not::Exist) -#BuildRequires: perl(List::Util::PP) -#BuildRequires: perl(MakeMaker::Test::NoXS) -#BuildRequires: perl(MakeMaker::Test::Setup::BFD) -#BuildRequires: perl(MakeMaker::Test::Setup::MPV) -#BuildRequires: perl(MakeMaker::Test::Setup::PL_FILES) -#BuildRequires: perl(MakeMaker::Test::Setup::Problem) -#BuildRequires: perl(MakeMaker::Test::Setup::Recurs) -#BuildRequires: perl(MakeMaker::Test::Setup::SAS) -#BuildRequires: perl(MakeMaker::Test::Setup::XS) -#BuildRequires: perl(MakeMaker::Test::Utils) -#BuildRequires: perl(my::bundles) -#BuildRequires: perl(Test::Builder::IO::Scalar) -#BuildRequires: perl(TieIn) -#BuildRequires: perl(TieOut) -#BuildRequires: perl(VMS::Feature) -#BuildRequires: perl(Win32API::File) -#BuildRequires: perl(YAML) -#BuildRequires: perl(YAML::Tiny) -%{perl_requires} %description This utility is designed to write a Makefile for an extension module from a @@ -86,6 +48,17 @@ It splits the task of generating the Makefile into several subroutines that can be individually overridden. Each subroutine returns the text it wishes to have written to the Makefile. +As there are various Make programs with incompatible syntax, which use +operating system shells, again with incompatible syntax, it is important +for users of this module to know which flavour of Make a Makefile has been +written for so they'll use the correct one and won't have to face the +possibly bewildering errors resulting from using the wrong one. + +On POSIX systems, that program will likely be GNU Make; on Microsoft +Windows, it will be either Microsoft NMake or DMake. Note that this module +does not support generating Makefiles for GNU Make on Windows. See the +section on the L parameter for details. + MakeMaker is object oriented. Each directory below the current directory that contains a Makefile.PL is treated as a separate object. This makes it possible to write an unlimited number of Makefiles with a single invocation @@ -93,11 +66,11 @@ of WriteMakefile(). %prep %setup -q -n %{cpan_name}-%{version} +find . -type f -print0 | xargs -0 chmod 644 # MANUAL BEGIN %patch0 rm -rf bundled # MANAUL END -find . -type f -print0 | xargs -0 chmod 644 %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -109,11 +82,12 @@ find . -type f -print0 | xargs -0 chmod 644 %install %perl_make_install rm $RPM_BUILD_ROOT/usr/bin/instmodsh +rm $RPM_BUILD_ROOT/usr/share/man/man1/instmodsh.1 %perl_process_packlist %perl_gen_filelist %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes my NOTES PATCHING README TODO +%doc Changes NOTES PATCHING README README.packaging TODO %changelog