Hello community, here is the log from the commit of package perl-Class-C3 for openSUSE:Factory checked in at 2013-07-29 17:45:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Class-C3 (Old) and /work/SRC/openSUSE:Factory/.perl-Class-C3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Class-C3" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Class-C3/perl-Class-C3.changes 2013-06-06 15:10:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Class-C3.new/perl-Class-C3.changes 2013-07-29 17:45:44.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Jul 26 18:30:33 UTC 2013 - [email protected] + +- updated to 0.25 + - Drop compatibility from 5.6.2 to 5.6.0 + - Pod typo fixes (RT#77453, RT#85357) + - Only ask for Devel::Hide on perls where it will be actually used + (RT#81106) + - Fix SYNOPSIS to actually be executable (RT#78327) + +------------------------------------------------------------------- Old: ---- Class-C3-0.24.tar.gz New: ---- Class-C3-0.25.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Class-C3.spec ++++++ --- /var/tmp/diff_new_pack.8DoI4i/_old 2013-07-29 17:45:45.000000000 +0200 +++ /var/tmp/diff_new_pack.8DoI4i/_new 2013-07-29 17:45:45.000000000 +0200 @@ -17,14 +17,14 @@ Name: perl-Class-C3 -Version: 0.24 +Version: 0.25 Release: 0 %define cpan_name Class-C3 -Summary: A pragma to use the C3 method resolution order algortihm +Summary: A pragma to use the C3 method resolution order algorithm License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Class-C3/ -Source: http://www.cpan.org/authors/id/F/FL/FLORA/%{cpan_name}-%{version}.tar.gz +Source: http://www.cpan.org/authors/id/M/MS/MSTROUT/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -44,7 +44,6 @@ #BuildRequires: perl(Diamond_A) #BuildRequires: perl(Foo) #BuildRequires: perl(Fuz) -#BuildRequires: perl(inc::Module::Install) >= 1.06 #BuildRequires: perl(InheritingFromOverloadedTest) #BuildRequires: perl(JSON) #BuildRequires: perl(LifeForm) ++++++ Class-C3-0.24.tar.gz -> Class-C3-0.25.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-C3-0.24/ChangeLog new/Class-C3-0.25/ChangeLog --- old/Class-C3-0.24/ChangeLog 2012-05-12 14:01:47.000000000 +0200 +++ new/Class-C3-0.25/ChangeLog 2013-07-04 12:27:23.000000000 +0200 @@ -1,5 +1,12 @@ Revision history for Perl extension Class::C3. +0.25 Thu, July 4, 2013 + - Drop compatibility from 5.6.2 to 5.6.0 + - Pod typo fixes (RT#77453, RT#85357) + - Only ask for Devel::Hide on perls where it will be actually used + (RT#81106) + - Fix SYNOPSIS to actually be executable (RT#78327) + 0.24 Sat, May 12, 2012 - Require Class::C3::XS on 5.8 perls if a working compiler is found diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-C3-0.24/MANIFEST new/Class-C3-0.25/MANIFEST --- old/Class-C3-0.24/MANIFEST 2012-05-12 14:02:15.000000000 +0200 +++ new/Class-C3-0.25/MANIFEST 2013-07-04 12:28:13.000000000 +0200 @@ -45,3 +45,4 @@ t/pod.t t/pod_coverage.t util/visualize_c3.pl +META.json Module JSON meta-data (added by MakeMaker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-C3-0.24/META.json new/Class-C3-0.25/META.json --- old/Class-C3-0.24/META.json 1970-01-01 01:00:00.000000000 +0100 +++ new/Class-C3-0.25/META.json 2013-07-04 12:28:13.000000000 +0200 @@ -0,0 +1,51 @@ +{ + "abstract" : "A pragma to use the C3 method resolution order algorithm", + "author" : [ + "Stevan Little, <[email protected]>" + ], + "dynamic_config" : 1, + "generated_by" : "ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.131560", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";, + "version" : "2" + }, + "name" : "Class-C3", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "Test::More" : "0.47" + } + }, + "configure" : { + "requires" : { + "ExtUtils::CBuilder" : "0.27" + } + }, + "runtime" : { + "requires" : { + "Algorithm::C3" : "0.07", + "Scalar::Util" : "0" + } + } + }, + "release_status" : "stable", + "resources" : { + "bugtracker" : { + "web" : "http://rt.cpan.org/Public/Dist/Display.html?Name=Class-C3"; + }, + "homepage" : "http://search.cpan.org/dist/Class-C3";, + "repository" : { + "url" : "git://git.shadowcat.co.uk/gitmo/Class-C3.git" + } + }, + "version" : "0.25" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-C3-0.24/META.yml new/Class-C3-0.25/META.yml --- old/Class-C3-0.24/META.yml 2012-05-12 14:02:13.000000000 +0200 +++ new/Class-C3-0.25/META.yml 2013-07-04 12:28:12.000000000 +0200 @@ -1,16 +1,13 @@ --- -abstract: 'A pragma to use the C3 method resolution order algortihm' +abstract: 'A pragma to use the C3 method resolution order algorithm' author: - 'Stevan Little, <[email protected]>' build_requires: - ExtUtils::MakeMaker: 6.59 Test::More: 0.47 configure_requires: ExtUtils::CBuilder: 0.27 - ExtUtils::MakeMaker: 6.59 -distribution_type: module dynamic_config: 1 -generated_by: 'Module::Install version 1.06' +generated_by: 'ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.131560' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -18,12 +15,13 @@ name: Class-C3 no_index: directory: - - inc - t + - inc requires: Algorithm::C3: 0.07 Scalar::Util: 0 - perl: 5.6.2 resources: - license: http://dev.perl.org/licenses/ -version: 0.24 + bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=Class-C3 + homepage: http://search.cpan.org/dist/Class-C3 + repository: git://git.shadowcat.co.uk/gitmo/Class-C3.git +version: 0.25 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-C3-0.24/Makefile.PL new/Class-C3-0.25/Makefile.PL --- old/Class-C3-0.24/Makefile.PL 2012-05-12 13:58:24.000000000 +0200 +++ new/Class-C3-0.25/Makefile.PL 2013-07-04 12:19:29.000000000 +0200 @@ -1,46 +1,136 @@ -use warnings; use strict; +use warnings; +use 5.006; + +use ExtUtils::MakeMaker; + +my $mymeta_works = eval { ExtUtils::MakeMaker->VERSION('6.5707'); 1 }; +my $mymeta = $mymeta_works || eval { ExtUtils::MakeMaker->VERSION('6.5702'); 1 }; + +my %BUILD_DEPS = ( + 'Test::More' => '0.47', +); +my %OPT_BUILD_DEPS = ( $] < 5.009_005 and is_smoker() ) + ? ( 'Devel::Hide' => 0 ) : () +; + +my %RUN_DEPS = ( + # needed by the PP version only, have them installed + # regardless of XS availability or perl version + # (for fatpacking and whatnot) + 'Algorithm::C3' => '0.07', + 'Scalar::Util' => '0', +); +my %OPT_RUN_DEPS = ( $] < 5.009_005 and can_xs() ) + ? ( 'Class::C3::XS' => '0.13' ) : () +; + +my %META_BITS = ( + resources => { + homepage => 'http://search.cpan.org/dist/Class-C3', + repository => 'git://git.shadowcat.co.uk/gitmo/Class-C3.git', + bugtracker => 'http://rt.cpan.org/Public/Dist/Display.html?Name=Class-C3', + }, +); + +my %WriteMakefileArgs = ( + 'NAME' => 'Class::C3', + 'AUTHOR' => 'Stevan Little, <[email protected]>', + 'VERSION_FROM' => 'lib/Class/C3.pm', + 'ABSTRACT_FROM' => 'lib/Class/C3.pm', + 'CONFIGURE_REQUIRES' => { 'ExtUtils::CBuilder' => 0.27 }, + 'PREREQ_PM' => { + %RUN_DEPS, %OPT_RUN_DEPS, + $mymeta_works ? () : (%BUILD_DEPS, %OPT_BUILD_DEPS), + }, + + $mymeta_works + ? ( # BUILD_REQUIRES makes MYMETA right, requires stops META being wrong + 'BUILD_REQUIRES' => { %BUILD_DEPS, %OPT_BUILD_DEPS }, + 'META_ADD' => { + %META_BITS, + requires => \%RUN_DEPS, + }, + ) + : ( # META_ADD both to get META right - only Makefile written + 'META_ADD' => { + %META_BITS, + requires => \%RUN_DEPS, + build_requires => \%BUILD_DEPS, + }, + ) + , + + ($mymeta and !$mymeta_works) ? ( 'NO_MYMETA' => 1 ) : (), + + 'LICENSE' => 'perl', +); + + +unless ( eval { ExtUtils::MakeMaker->VERSION('6.56') } ) { + my $br = delete $WriteMakefileArgs{BUILD_REQUIRES}; + my $pp = $WriteMakefileArgs{PREREQ_PM}; + for my $mod ( keys %$br ) { + if ( exists $pp->{$mod} ) { + $pp->{$mod} = $br->{$mod} if $br->{$mod} > $pp->{$mod}; + } + else { + $pp->{$mod} = $br->{$mod}; + } + } +} -use 5.006002; -use inc::Module::Install 1.06; +delete $WriteMakefileArgs{CONFIGURE_REQUIRES} + unless eval { ExtUtils::MakeMaker->VERSION('6.52') }; + +system("pod2text lib/Class/C3.pm >README") + unless -f 'META.yml'; + +WriteMakefile(%WriteMakefileArgs); + +# Secondary compile testing via ExtUtils::CBuilder +sub can_xs { + # Do we have the configure_requires checker? + local $@; + eval "require ExtUtils::CBuilder;"; + if (! $@ ) { + # They don't obey configure_requires, so it is + # someone old and delicate. Try to avoid hurting + # them by falling back to an older simpler test. + return can_cc(); + } + + return ExtUtils::CBuilder->new( quiet => 1 )->have_compiler; +} -perl_version '5.006002'; -name 'Class-C3'; -all_from 'lib/Class/C3.pm'; - -test_requires 'Test::More' => '0.47'; - -# needed by the PP version only, have them installed -# regardless of XS availability or perl version -# (for fatpacking and whatnot) -requires 'Algorithm::C3' => '0.07'; -requires 'Scalar::Util' => '0'; - -# XS not interesting after mro is cored -requires 'Class::C3::XS' => '0.13' - if $] < 5.009_005 and can_xs(); - -test_requires 'Devel::Hide' => 0 - if is_smoker(); - -if($Module::Install::AUTHOR) { - # compiler detection, goes into META - configure_requires 'ExtUtils::MakeMaker' => '6.52'; - configure_requires 'ExtUtils::CBuilder' => '0.27'; +# can we locate a (the) C compiler +sub can_cc { + my @chunks = split(/ /, $Config::Config{cc}) or return; + + # $Config{cc} may contain args; try to find out the program part + while (@chunks) { + return can_run("@chunks") || (pop(@chunks), next); + } - # Rebuild README for maintainers - system("pod2text lib/Class/C3.pm >README"); + return; } -WriteAll; +# check if we can run some command +sub can_run { + my ($cmd) = @_; + + return $cmd if -x $cmd; + if (my $found_cmd = MM->maybe_command($cmd)) { + return $found_cmd; + } + + for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { + next if $dir eq ''; + my $abs = File::Spec->catfile($dir, $cmd); + return $abs if (-x $abs or $abs = MM->maybe_command($abs)); + } -if ($Module::Install::AUTHOR) { - @{Meta->{values}{requires}} = grep - { $_->[0] !~ /^ (?: Class::C3::XS | Devel::Hide ) $/x } - @{Meta->{values}{requires}} - ; - print "Regenerating META with XS/test requires excluded\n"; - Meta->write; + return; } sub is_smoker { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-C3-0.24/README new/Class-C3-0.25/README --- old/Class-C3-0.24/README 2012-05-12 14:02:13.000000000 +0200 +++ new/Class-C3-0.25/README 2012-12-07 07:02:16.000000000 +0100 @@ -1,5 +1,5 @@ NAME - Class::C3 - A pragma to use the C3 method resolution order algortihm + Class::C3 - A pragma to use the C3 method resolution order algorithm SYNOPSIS # NOTE - DO NOT USE Class::C3 directly as a user, use MRO::Compat instead! @@ -55,13 +55,13 @@ C3 is the name of an algorithm which aims to provide a sane method resolution order under multiple inheritance. It was first introduced in the langauge Dylan (see links in the "SEE ALSO" section), and then later - adopted as the prefered MRO (Method Resolution Order) for the new-style + adopted as the preferred MRO (Method Resolution Order) for the new-style classes in Python 2.3. Most recently it has been adopted as the 'canonical' MRO for Perl 6 classes, and the default MRO for Parrot objects as well. How does C3 work. - C3 works by always preserving local precendence ordering. This + C3 works by always preserving local precedence ordering. This essentially means that no class will appear before any of its subclasses. Take the classic diamond inheritance pattern for instance: @@ -115,10 +115,10 @@ proper C3 method resolution order. initialize - This must be called to initalize the C3 method dispatch tables, this - module will not work if you do not do this. It is advised to do this - as soon as possible after loading any classes which use C3. Here is - a quick code example: + This must be called to initialize the C3 method dispatch tables, + this module will not work if you do not do this. It is advised to do + this as soon as possible after loading any classes which use C3. + Here is a quick code example: package Foo; use Class::C3; @@ -222,7 +222,7 @@ But there are still caveats, so here goes ... Use of "SUPER::". - The idea of "SUPER::" under multiple inheritance is ambigious, and + The idea of "SUPER::" under multiple inheritance is ambiguous, and generally not recomended anyway. However, its use in conjuntion with this module is very much not recommended, and in fact very discouraged. The recommended approach is to instead use the supplied diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-C3-0.24/lib/Class/C3/next.pm new/Class-C3-0.25/lib/Class/C3/next.pm --- old/Class-C3-0.24/lib/Class/C3/next.pm 2012-05-12 14:01:28.000000000 +0200 +++ new/Class-C3-0.25/lib/Class/C3/next.pm 2012-12-07 06:42:04.000000000 +0100 @@ -83,7 +83,7 @@ =head1 DESCRIPTION This module is used internally by L<Class::C3> when -neccesary, and shouldn't be used (or required in +necessary, and shouldn't be used (or required in distribution dependencies) directly. It defines C<next::method>, C<next::can>, and C<maybe::next::method> in pure perl. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-C3-0.24/lib/Class/C3.pm new/Class-C3-0.25/lib/Class/C3.pm --- old/Class-C3-0.24/lib/Class/C3.pm 2012-05-12 14:01:15.000000000 +0200 +++ new/Class-C3-0.25/lib/Class/C3.pm 2013-07-04 12:26:58.000000000 +0200 @@ -4,7 +4,7 @@ use strict; use warnings; -our $VERSION = '0.24'; +our $VERSION = '0.25'; our $C3_IN_CORE; our $C3_XS; @@ -44,7 +44,7 @@ # this: # # $MRO{$class} = { -# MRO => [ <class precendence list> ], +# MRO => [ <class precedence list> ], # methods => { # orig => <original location of method>, # code => \&<ref to original method> @@ -137,7 +137,7 @@ my %methods; # NOTE: # we do @MRO[1 .. $#MRO] here because it - # makes no sense to interogate the class + # makes no sense to interrogate the class # which you are calculating for. foreach my $local (@MRO[1 .. $#MRO]) { # if overload has tagged this module to @@ -146,7 +146,7 @@ $has_overload_fallback = ${"${local}::()"} if !defined $has_overload_fallback && defined ${"${local}::()"}; foreach my $method (grep { defined &{"${local}::$_"} } keys %{"${local}::"}) { - # skip if already overriden in local class + # skip if already overridden in local class next unless !defined *{"${class}::$method"}{CODE}; $methods{$method} = { orig => "${local}::$method", @@ -233,27 +233,27 @@ =head1 NAME -Class::C3 - A pragma to use the C3 method resolution order algortihm +Class::C3 - A pragma to use the C3 method resolution order algorithm =head1 SYNOPSIS # NOTE - DO NOT USE Class::C3 directly as a user, use MRO::Compat instead! - package A; + package ClassA; use Class::C3; sub hello { 'A::hello' } - package B; - use base 'A'; + package ClassB; + use base 'ClassA'; use Class::C3; - package C; - use base 'A'; + package ClassC; + use base 'ClassA'; use Class::C3; sub hello { 'C::hello' } - package D; - use base ('B', 'C'); + package ClassD; + use base ('ClassB', 'ClassC'); use Class::C3; # Classic Diamond MI pattern @@ -269,12 +269,12 @@ # (formerly called in INIT) Class::C3::initialize(); - print join ', ' => Class::C3::calculateMRO('Diamond_D') # prints D, B, C, A + print join ', ' => Class::C3::calculateMRO('ClassD'); # prints ClassD, ClassB, ClassC, ClassA - print D->hello() # prints 'C::hello' instead of the standard p5 'A::hello' + print ClassD->hello(); # prints 'C::hello' instead of the standard p5 'A::hello' - D->can('hello')->(); # can() also works correctly - UNIVERSAL::can('D', 'hello'); # as does UNIVERSAL::can() + ClassD->can('hello')->(); # can() also works correctly + UNIVERSAL::can('ClassD', 'hello'); # as does UNIVERSAL::can() =head1 DESCRIPTION @@ -289,14 +289,14 @@ =head2 What is C3? C3 is the name of an algorithm which aims to provide a sane method resolution order under multiple -inheritance. It was first introduced in the langauge Dylan (see links in the L<SEE ALSO> section), -and then later adopted as the prefered MRO (Method Resolution Order) for the new-style classes in +inheritance. It was first introduced in the language Dylan (see links in the L<SEE ALSO> section), +and then later adopted as the preferred MRO (Method Resolution Order) for the new-style classes in Python 2.3. Most recently it has been adopted as the 'canonical' MRO for Perl 6 classes, and the default MRO for Parrot objects as well. =head2 How does C3 work. -C3 works by always preserving local precendence ordering. This essentially means that no class will +C3 works by always preserving local precedence ordering. This essentially means that no class will appear before any of its subclasses. Take the classic diamond inheritance pattern for instance: <A> @@ -309,7 +309,7 @@ though B<C> is the subclass of B<A>. The C3 MRO algorithm however, produces the following MRO (D, B, C, A), which does not have this same issue. -This example is fairly trival, for more complex examples and a deeper explaination, see the links in +This example is fairly trivial, for more complex examples and a deeper explanation, see the links in the L<SEE ALSO> section. =head2 How does this module work? @@ -333,12 +333,12 @@ package MyClass; use c3; -The the more clunky: +This is more clunky: package MyClass; use Class::C3; -But hey, it's your choice, thats why it is optional. +But hey, it's your choice, that's why it is optional. =head1 FUNCTIONS @@ -350,7 +350,7 @@ =item B<initialize> -This B<must be called> to initalize the C3 method dispatch tables, this module B<will not work> if +This B<must be called> to initialize the C3 method dispatch tables, this module B<will not work> if you do not do this. It is advised to do this as soon as possible B<after> loading any classes which use C3. Here is a quick code example: @@ -370,7 +370,7 @@ This function used to be called automatically for you in the INIT phase of the perl compiler, but that lead to warnings if this module was required at runtime. After discussion with my user base (the L<DBIx::Class> folks), we decided that calling this in INIT was more of an annoyance than a -convience. I apologize to anyone this causes problems for (although i would very suprised if I had +convenience. I apologize to anyone this causes problems for (although I would be very surprised if I had any other users other than the L<DBIx::Class> folks). The simplest solution of course is to define your own INIT method which calls this function. @@ -455,8 +455,8 @@ =item Use of C<SUPER::>. -The idea of C<SUPER::> under multiple inheritance is ambigious, and generally not recomended anyway. -However, its use in conjuntion with this module is very much not recommended, and in fact very +The idea of C<SUPER::> under multiple inheritance is ambiguous, and generally not recommended anyway. +However, its use in conjunction with this module is very much not recommended, and in fact very discouraged. The recommended approach is to instead use the supplied C<next::method> feature, see more details on its usage above. @@ -465,12 +465,12 @@ It is the author's opinion that changing C<@ISA> at runtime is pure insanity anyway. However, people do it, so I must caveat. Any changes to the C<@ISA> will not be reflected in the MRO calculated by this module, and therefore probably won't even show up. If you do this, you will need to call C<reinitialize> -in order to recalulate B<all> method dispatch tables. See the C<reinitialize> documentation and an example +in order to recalculate B<all> method dispatch tables. See the C<reinitialize> documentation and an example in F<t/20_reinitialize.t> for more information. =item Adding/deleting methods from class symbol tables. -This module calculates the MRO for each requested class by interogating the symbol tables of said classes. +This module calculates the MRO for each requested class by interrogating the symbol tables of said classes. So any symbol table manipulation which takes place after our INIT phase is run will not be reflected in the calculated MRO. Just as with changing the C<@ISA>, you will need to call C<reinitialize> for any changes you make to take effect. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Class-C3-0.24/t/40_no_xs.t new/Class-C3-0.25/t/40_no_xs.t --- old/Class-C3-0.24/t/40_no_xs.t 2012-05-12 13:58:24.000000000 +0200 +++ new/Class-C3-0.25/t/40_no_xs.t 2013-07-04 12:19:29.000000000 +0200 @@ -15,6 +15,7 @@ use Config; use IPC::Open2 qw(open2); +use File::Glob 'bsd_glob'; # for the $^X-es $ENV{PERL5LIB} = join ($Config{path_sep}, @INC); @@ -22,7 +23,7 @@ # rerun the tests under the assumption of pure-perl my $this_file = quotemeta(__FILE__); -for my $fn (glob("t/*.t")) { +for my $fn (bsd_glob("t/*.t")) { next if $fn =~ /${this_file}$/; local $ENV{DEVEL_HIDE_VERBOSE} = 0; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
