rpms/perl-Async-MergePoint/devel import.log, NONE, 1.1 perl-Async-MergePoint.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/pkgs/rpms/perl-Async-MergePoint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1937/devel
Modified Files:
.cvsignore sources
Added Files:
import.log perl-Async-MergePoint.spec
Log Message:
Initial import for devel
--- NEW FILE import.log ---
perl-Async-MergePoint-0_03-1_fc11:HEAD:perl-Async-MergePoint-0.03-1.fc11.src.rpm:1248860106
--- NEW FILE perl-Async-MergePoint.spec ---
Name: perl-Async-MergePoint
Version: 0.03
Release: 1%{?dist}
Summary: Resynchronise diverged control flow
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Async-MergePoint/
Source0: http://www.cpan.org/authors/id/P/PE/PEVANS/Async-MergePoint-%{version}.ta...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: perl(Module::Build)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::More)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description
Often in program logic, multiple different steps need to be taken that are
independent of each other, but their total result is needed before the next
step can be taken. In synchonous code, the usual approach is to do them
sequentially.
%prep
%setup -q -n Async-MergePoint-%{version}
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
%{_fixperms} $RPM_BUILD_ROOT/*
%check
make test
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/Async
%{_mandir}/man3/*
%changelog
* Tue Jul 21 2009 Nicolas Chauvet (kwizart) 0.03-1
- Specfile autogenerated by cpanspec 1.78.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Async-MergePoint/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 28 Jul 2009 04:37:12 -0000 1.1
+++ .cvsignore 29 Jul 2009 09:37:26 -0000 1.2
@@ -0,0 +1 @@
+Async-MergePoint-0.03.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Async-MergePoint/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 28 Jul 2009 04:37:12 -0000 1.1
+++ sources 29 Jul 2009 09:37:26 -0000 1.2
@@ -0,0 +1 @@
+f4a6f9a9dc0a1748f503c01893d544cc Async-MergePoint-0.03.tar.gz
14 years, 10 months
rpms/perl-Data-ICal/F-10 Data-ICal-0.16.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 perl-Data-ICal.spec, 1.4, 1.5 sources, 1.3, 1.4
by corsepiu
Author: corsepiu
Update of /cvs/pkgs/rpms/perl-Data-ICal/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18733
Modified Files:
.cvsignore perl-Data-ICal.spec sources
Added Files:
Data-ICal-0.16.diff
Log Message:
* Wed Jul 29 2009 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 0.16-1
- Upstream update.
- Replace broken inc/Module/Install/* with a copy of Module::Install-0.91.
Data-ICal-0.16.diff:
AutoInstall.pm | 341 ++++++++++++++++++++++++++++++++++++++++++----
Install.pm | 7
Install/Admin.pm | 294 +++++++++++++++++++++++++++++++++++++++
Install/Admin/Bundle.pm | 73 +++++++++
Install/Admin/Compiler.pm | 27 +++
Install/Admin/Find.pm | 77 ++++++++++
Install/Admin/Include.pm | 147 +++++++++++++++++++
Install/Admin/Makefile.pm | 53 +++++++
Install/Admin/Manifest.pm | 162 +++++++++++++++++++++
Install/Admin/Metadata.pm | 185 ++++++++++++++++++++++++
Install/Admin/ScanDeps.pm | 80 ++++++++++
Install/Admin/WriteAll.pm | 20 ++
Install/AutoInstall.pm | 9 -
Install/Base.pm | 116 ++++++++++++---
Install/Bundle.pm | 195 ++++++++++++++++++++++++++
Install/Can.pm | 93 +++++++++++-
Install/Compiler.pm | 123 ++++++++++++++++
Install/DSL.pm | 91 ++++++++++++
Install/Deprecated.pm | 115 +++++++++++++++
Install/External.pm | 138 ++++++++++++++++++
Install/Fetch.pm | 9 -
Install/Include.pm | 9 -
Install/Inline.pm | 49 ++++++
Install/MakeMaker.pm | 49 ++++++
Install/Makefile.pm | 140 +++++++++++++++++-
Install/Metadata.pm | 105 +++++++++-----
Install/PAR.pm | 274 ++++++++++++++++++++++++++++++++++++
Install/Philosophy.pod | 187 +++++++++++++++++++++++++
Install/Run.pm | 15 ++
Install/Scripts.pm | 28 +++
Install/Share.pm | 125 ++++++++++++++++
Install/Win32.pm | 7
Install/With.pm | 159 +++++++++++++++++++++
Install/WriteAll.pm | 19 +-
34 files changed, 3395 insertions(+), 126 deletions(-)
--- NEW FILE Data-ICal-0.16.diff ---
diff -Naur Data-ICal-0.16.orig/inc/Module/AutoInstall.pm Data-ICal-0.16/inc/Module/AutoInstall.pm
--- Data-ICal-0.16.orig/inc/Module/AutoInstall.pm 2009-07-10 16:52:29.000000000 +0200
+++ Data-ICal-0.16/inc/Module/AutoInstall.pm 2009-07-29 09:44:08.000000000 +0200
@@ -1,4 +1,3 @@
-#line 1
package Module::AutoInstall;
use strict;
@@ -18,7 +17,9 @@
# various lexical flags
my ( @Missing, @Existing, %DisabledTests, $UnderCPAN, $HasCPANPLUS );
-my ( $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly );
+my (
+ $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps
+);
my ( $PostambleActions, $PostambleUsed );
# See if it's a testing or non-interactive session
@@ -73,6 +74,9 @@
elsif ( $arg =~ /^--test(?:only)?$/ ) {
$TestOnly = 1;
}
+ elsif ( $arg =~ /^--all(?:deps)?$/ ) {
+ $AllDeps = 1;
+ }
}
}
@@ -115,7 +119,12 @@
)[0]
);
- $UnderCPAN = _check_lock(1); # check for $UnderCPAN
+ # We want to know if we're under CPAN early to avoid prompting, but
+ # if we aren't going to try and install anything anyway then skip the
+ # check entirely since we don't want to have to load (and configure)
+ # an old CPAN just for a cosmetic message
+
+ $UnderCPAN = _check_lock(1) unless $SkipInstall;
while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) {
my ( @required, @tests, @skiptests );
@@ -165,15 +174,24 @@
}
# XXX: check for conflicts and uninstalls(!) them.
- if (
- defined( my $cur = _version_check( _load($mod), $arg ||= 0 ) ) )
+ my $cur = _load($mod);
+ if (_version_cmp ($cur, $arg) >= 0)
{
print "loaded. ($cur" . ( $arg ? " >= $arg" : '' ) . ")\n";
push @Existing, $mod => $arg;
$DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
}
else {
- print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n";
+ if (not defined $cur) # indeed missing
+ {
+ print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n";
+ }
+ else
+ {
+ # no need to check $arg as _version_cmp ($cur, undef) would satisfy >= above
+ print "too old. ($cur < $arg)\n";
+ }
+
push @required, $mod => $arg;
}
}
@@ -187,6 +205,7 @@
and (
$CheckOnly
or ($mandatory and $UnderCPAN)
+ or $AllDeps
or _prompt(
qq{==> Auto-install the }
. ( @required / 2 )
@@ -235,21 +254,38 @@
*{'main::WriteMakefile'} = \&Write if caller(0) eq 'main';
}
+sub _running_under {
+ my $thing = shift;
+ print <<"END_MESSAGE";
+*** Since we're running under ${thing}, I'll just let it take care
+ of the dependency's installation later.
+END_MESSAGE
+ return 1;
+}
+
# Check to see if we are currently running under CPAN.pm and/or CPANPLUS;
# if we are, then we simply let it taking care of our dependencies
sub _check_lock {
return unless @Missing or @_;
+ my $cpan_env = $ENV{PERL5_CPAN_IS_RUNNING};
+
if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) {
- print <<'END_MESSAGE';
+ return _running_under($cpan_env ? 'CPAN' : 'CPANPLUS');
+ }
-*** Since we're running under CPANPLUS, I'll just let it take care
- of the dependency's installation later.
-END_MESSAGE
- return 1;
+ require CPAN;
+
+ if ($CPAN::VERSION > '1.89') {
+ if ($cpan_env) {
+ return _running_under('CPAN');
+ }
+ return; # CPAN.pm new enough, don't need to check further
}
- _load_cpan();
+ # last ditch attempt, this -will- configure CPAN, very sorry
+
+ _load_cpan(1); # force initialize even though it's already loaded
# Find the CPAN lock-file
my $lock = MM->catfile( $CPAN::Config->{cpan_home}, ".lock" );
@@ -285,7 +321,7 @@
while ( my ( $pkg, $ver ) = splice( @_, 0, 2 ) ) {
# grep out those already installed
- if ( defined( _version_check( _load($pkg), $ver ) ) ) {
+ if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
push @installed, $pkg;
}
else {
@@ -324,7 +360,7 @@
# see if we have successfully installed them
while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
- if ( defined( _version_check( _load($pkg), $ver ) ) ) {
+ if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
push @installed, $pkg;
}
elsif ( $args{do_once} and open( FAILED, '>> .#autoinstall.failed' ) ) {
@@ -379,7 +415,7 @@
my $success;
my $obj = $modtree->{$pkg};
- if ( $obj and defined( _version_check( $obj->{version}, $ver ) ) ) {
+ if ( $obj and _version_cmp( $obj->{version}, $ver ) >= 0 ) {
my $pathname = $pkg;
$pathname =~ s/::/\\W/;
@@ -472,7 +508,7 @@
my $obj = CPAN::Shell->expand( Module => $pkg );
my $success = 0;
- if ( $obj and defined( _version_check( $obj->cpan_version, $ver ) ) ) {
+ if ( $obj and _version_cmp( $obj->cpan_version, $ver ) >= 0 ) {
my $pathname = $pkg;
$pathname =~ s/::/\\W/;
@@ -536,7 +572,7 @@
my $ver = shift;
return
- if defined( _version_check( _load($class), $ver ) ); # no need to upgrade
+ if _version_cmp( _load($class), $ver ) >= 0; # no need to upgrade
if (
_prompt( "==> A newer version of $class ($ver) is required. Install?",
@@ -633,7 +669,7 @@
# Load CPAN.pm and it's configuration
sub _load_cpan {
- return if $CPAN::VERSION;
+ return if $CPAN::VERSION and $CPAN::Config and not @_;
require CPAN;
if ( $CPAN::HandleConfig::VERSION ) {
# Newer versions of CPAN have a HandleConfig module
@@ -645,9 +681,11 @@
}
# compare two versions, either use Sort::Versions or plain comparison
-sub _version_check {
+# return values same as <=>
+sub _version_cmp {
my ( $cur, $min ) = @_;
- return unless defined $cur;
+ return -1 unless defined $cur; # if 0 keep comparing
+ return 1 unless $min;
$cur =~ s/\s+$//;
@@ -658,16 +696,13 @@
) {
# use version.pm if it is installed.
- return (
- ( version->new($cur) >= version->new($min) ) ? $cur : undef );
+ return version->new($cur) <=> version->new($min);
[...3605 lines suppressed...]
+
+
+#####################################################################
+# Testing and Configuration Contexts
+
+=pod
+
+=head2 interactive
+
+The C<interactive> function tests for an install that has a user present
+(or at least, one in which it is reasonable for us to present prompts
+and other similar types of things).
+
+Returns true if in an interactive environment, or false otherwise.
+
+=cut
+
+sub interactive {
+ # Treat things interactively ONLY based on input
+ !! (-t STDIN and ! automated_testing());
+}
+
+=pod
+
+=head2 automated_testing
+
+Are we currently running in an automated testing environment, such as
+CPAN Testers.
+
+This is primarily a cleaner and more human-readable equivalent of
+checking $ENV{AUTOMATED_TESTING} yourself, but may be improved in line
+with best practices at a later date.
+
+=cut
+
+sub automated_testing {
+ !! $ENV{AUTOMATED_TESTING};
+}
+
+=pod
+
+=head2 release_testing
+
+Are we currently running in an release testing environment. That is,
+are we in the process of running in a potential highly-intensive and
+high dependency bloat testing process prior to packaging a module for
+release.
+
+This is primarily a cleaner and more human-readable equivalent of
+checking $ENV{RELEASE_TESTING} yourself, but may be improved in line
+with best practices at a later date.
+
+=cut
+
+sub release_testing {
+ !! $ENV{RELEASE_TESTING};
+}
+
+sub author_context {
+ !! $Module::Install::AUTHOR;
+}
+
+
+
+
+
+#####################################################################
+# Operating System Convenience
+
+=pod
+
+=head2 win32
+
+The C<win32> function tests if the Makefile.PL is currently running in a
+native Microsoft Windows Perl, such as ActivePerl or Strawberry Perl.
+
+This is primarily a cleaner and more human-readable equivalent of
+checking C<$^O eq 'MSWin32'> yourself, but may be improved in line
+with best practices at a later date.
+
+=cut
+
+sub win32 {
+ !! ($^O eq 'MSWin32');
+}
+
+=pod
+
+=head2 winlike
+
+The C<winlike> function tests if the Makefile.PL is currently running
+in a Microsoft Windows Perl, under either cygwin or a native Win32 Perl.
+
+This is primarily a cleaner and more human-readable equivalent of
+checking C<$^O eq 'MSWin32' or $^O eq 'cygwin'>yourself, but may be
+improved in line with best practices at a later date.
+
+=cut
+
+sub winlike {
+ !! ($^O eq 'MSWin32' or $^O eq 'cygwin');
+}
+
+1;
+
+=pod
+
+=head1 SEE ALSO
+
+L<Module::Install>
+
+=head1 AUTHORS
+
+Adam Kennedy E<lt>adamk(a)cpan.orgE<gt>
+
+=head1 COPYRIGHT
+
+Copyright 2007 - 2009 Adam Kennedy.
+
+This program is free software; you can redistribute
+it and/or modify it under the same terms as Perl itself.
+
+The full text of the license can be found in the
+LICENSE file included with this module.
+
+=cut
diff -Naur Data-ICal-0.16.orig/inc/Module/Install/WriteAll.pm Data-ICal-0.16/inc/Module/Install/WriteAll.pm
--- Data-ICal-0.16.orig/inc/Module/Install/WriteAll.pm 2009-07-10 16:52:30.000000000 +0200
+++ Data-ICal-0.16/inc/Module/Install/WriteAll.pm 2009-05-27 18:46:13.000000000 +0200
@@ -1,12 +1,11 @@
-#line 1
package Module::Install::WriteAll;
use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.85';
+ $VERSION = '0.91';;
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
@@ -41,8 +40,18 @@
# The Makefile write process adds a couple of dependencies,
# so write the META.yml files after the Makefile.
- $self->Meta->write if $args{meta};
- $self->Meta->write_mymeta if $self->mymeta;
+ if ( $args{meta} ) {
+ $self->Meta->write;
+ }
+
+ # Experimental support for MYMETA
+ if ( $ENV{X_MYMETA} ) {
+ if ( $ENV{X_MYMETA} eq 'JSON' ) {
+ $self->Meta->write_mymeta_json;
+ } else {
+ $self->Meta->write_mymeta_yaml;
+ }
+ }
return 1;
}
diff -Naur Data-ICal-0.16.orig/inc/Module/Install.pm Data-ICal-0.16/inc/Module/Install.pm
--- Data-ICal-0.16.orig/inc/Module/Install.pm 2009-07-10 16:52:28.000000000 +0200
+++ Data-ICal-0.16/inc/Module/Install.pm 2009-07-29 09:44:13.000000000 +0200
@@ -1,4 +1,3 @@
-#line 1
package Module::Install;
# For any maintainers:
@@ -28,7 +27,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '0.85';
+ $VERSION = '0.91';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -353,7 +352,7 @@
if ( $] >= 5.006 ) {
open( FH, '<', $_[0] ) or die "open($_[0]): $!";
} else {
- open( FH, "< $_[0]" ) or die "open($_[0]): $!";
+ open( FH, "< $_[0]" ) or die "open($_[0]): $!";
}
my $string = do { local $/; <FH> };
close FH or die "close($_[0]): $!";
@@ -384,7 +383,7 @@
if ( $] >= 5.006 ) {
open( FH, '>', $_[0] ) or die "open($_[0]): $!";
} else {
- open( FH, "> $_[0]" ) or die "open($_[0]): $!";
+ open( FH, "> $_[0]" ) or die "open($_[0]): $!";
}
foreach ( 1 .. $#_ ) {
print FH $_[$_] or die "print($_[0]): $!";
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-ICal/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 4 Mar 2009 14:36:25 -0000 1.3
+++ .cvsignore 29 Jul 2009 08:25:43 -0000 1.4
@@ -1 +1 @@
-Data-ICal-0.15.tar.gz
+Data-ICal-0.16.tar.gz
Index: perl-Data-ICal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-ICal/F-10/perl-Data-ICal.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- perl-Data-ICal.spec 4 Mar 2009 14:36:25 -0000 1.4
+++ perl-Data-ICal.spec 29 Jul 2009 08:25:43 -0000 1.5
@@ -1,13 +1,19 @@
Name: perl-Data-ICal
-Version: 0.15
+Version: 0.16
Release: 1%{?dist}
Summary: Generates iCalendar (RFC 2445) calendar files
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Data-ICal/
Source0: http://www.cpan.org/authors/id/A/AL/ALEXMV/Data-ICal-%{version}.tar.gz
+
+# inc/Module/Install* is broken, replace it with Module-Install-0.91
+Patch0: Data-ICal-%{version}.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
+
+BuildRequires: perl(CPAN) perl(YAML::Tiny) perl(File::Remove)
+
BuildRequires: perl(Class::Accessor)
BuildRequires: perl(Class::ReturnValue)
BuildRequires: perl(ExtUtils::MakeMaker)
@@ -32,9 +38,10 @@ many popular calendaring programs such a
%prep
%setup -q -n Data-ICal-%{version}
+%patch0 -p1
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+%{__perl} Makefile.PL INSTALLDIRS=vendor --skipdeps
make %{?_smp_mflags}
%install
@@ -60,6 +67,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/*
%changelog
+* Wed Jul 29 2009 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 0.16-1
+- Upstream update.
+- Replace broken inc/Module/Install/* with a copy of Module::Install-0.91.
+
* Tue Mar 03 2009 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 0.15-1
- Upstream update.
- Reflect upstream maintainer having changed.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-ICal/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 4 Mar 2009 14:36:25 -0000 1.3
+++ sources 29 Jul 2009 08:25:43 -0000 1.4
@@ -1 +1 @@
-71c830a2da27163d770b5c17fcc11541 Data-ICal-0.15.tar.gz
+12430864424a7bfe77e5d62a083f792c Data-ICal-0.16.tar.gz
14 years, 10 months
rpms/perl-Data-ICal/F-11 Data-ICal-0.16.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 perl-Data-ICal.spec, 1.5, 1.6 sources, 1.3, 1.4
by corsepiu
Author: corsepiu
Update of /cvs/pkgs/rpms/perl-Data-ICal/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17511
Modified Files:
.cvsignore perl-Data-ICal.spec sources
Added Files:
Data-ICal-0.16.diff
Log Message:
* Wed Jul 29 2009 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 0.16-1
- Upstream update.
- Replace broken inc/Module/Install/* with a copy of Module::Install-0.91.
Data-ICal-0.16.diff:
AutoInstall.pm | 341 ++++++++++++++++++++++++++++++++++++++++++----
Install.pm | 7
Install/Admin.pm | 294 +++++++++++++++++++++++++++++++++++++++
Install/Admin/Bundle.pm | 73 +++++++++
Install/Admin/Compiler.pm | 27 +++
Install/Admin/Find.pm | 77 ++++++++++
Install/Admin/Include.pm | 147 +++++++++++++++++++
Install/Admin/Makefile.pm | 53 +++++++
Install/Admin/Manifest.pm | 162 +++++++++++++++++++++
Install/Admin/Metadata.pm | 185 ++++++++++++++++++++++++
Install/Admin/ScanDeps.pm | 80 ++++++++++
Install/Admin/WriteAll.pm | 20 ++
Install/AutoInstall.pm | 9 -
Install/Base.pm | 116 ++++++++++++---
Install/Bundle.pm | 195 ++++++++++++++++++++++++++
Install/Can.pm | 93 +++++++++++-
Install/Compiler.pm | 123 ++++++++++++++++
Install/DSL.pm | 91 ++++++++++++
Install/Deprecated.pm | 115 +++++++++++++++
Install/External.pm | 138 ++++++++++++++++++
Install/Fetch.pm | 9 -
Install/Include.pm | 9 -
Install/Inline.pm | 49 ++++++
Install/MakeMaker.pm | 49 ++++++
Install/Makefile.pm | 140 +++++++++++++++++-
Install/Metadata.pm | 105 +++++++++-----
Install/PAR.pm | 274 ++++++++++++++++++++++++++++++++++++
Install/Philosophy.pod | 187 +++++++++++++++++++++++++
Install/Run.pm | 15 ++
Install/Scripts.pm | 28 +++
Install/Share.pm | 125 ++++++++++++++++
Install/Win32.pm | 7
Install/With.pm | 159 +++++++++++++++++++++
Install/WriteAll.pm | 19 +-
34 files changed, 3395 insertions(+), 126 deletions(-)
--- NEW FILE Data-ICal-0.16.diff ---
diff -Naur Data-ICal-0.16.orig/inc/Module/AutoInstall.pm Data-ICal-0.16/inc/Module/AutoInstall.pm
--- Data-ICal-0.16.orig/inc/Module/AutoInstall.pm 2009-07-10 16:52:29.000000000 +0200
+++ Data-ICal-0.16/inc/Module/AutoInstall.pm 2009-07-29 09:44:08.000000000 +0200
@@ -1,4 +1,3 @@
-#line 1
package Module::AutoInstall;
use strict;
@@ -18,7 +17,9 @@
# various lexical flags
my ( @Missing, @Existing, %DisabledTests, $UnderCPAN, $HasCPANPLUS );
-my ( $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly );
+my (
+ $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps
+);
my ( $PostambleActions, $PostambleUsed );
# See if it's a testing or non-interactive session
@@ -73,6 +74,9 @@
elsif ( $arg =~ /^--test(?:only)?$/ ) {
$TestOnly = 1;
}
+ elsif ( $arg =~ /^--all(?:deps)?$/ ) {
+ $AllDeps = 1;
+ }
}
}
@@ -115,7 +119,12 @@
)[0]
);
- $UnderCPAN = _check_lock(1); # check for $UnderCPAN
+ # We want to know if we're under CPAN early to avoid prompting, but
+ # if we aren't going to try and install anything anyway then skip the
+ # check entirely since we don't want to have to load (and configure)
+ # an old CPAN just for a cosmetic message
+
+ $UnderCPAN = _check_lock(1) unless $SkipInstall;
while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) {
my ( @required, @tests, @skiptests );
@@ -165,15 +174,24 @@
}
# XXX: check for conflicts and uninstalls(!) them.
- if (
- defined( my $cur = _version_check( _load($mod), $arg ||= 0 ) ) )
+ my $cur = _load($mod);
+ if (_version_cmp ($cur, $arg) >= 0)
{
print "loaded. ($cur" . ( $arg ? " >= $arg" : '' ) . ")\n";
push @Existing, $mod => $arg;
$DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
}
else {
- print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n";
+ if (not defined $cur) # indeed missing
+ {
+ print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n";
+ }
+ else
+ {
+ # no need to check $arg as _version_cmp ($cur, undef) would satisfy >= above
+ print "too old. ($cur < $arg)\n";
+ }
+
push @required, $mod => $arg;
}
}
@@ -187,6 +205,7 @@
and (
$CheckOnly
or ($mandatory and $UnderCPAN)
+ or $AllDeps
or _prompt(
qq{==> Auto-install the }
. ( @required / 2 )
@@ -235,21 +254,38 @@
*{'main::WriteMakefile'} = \&Write if caller(0) eq 'main';
}
+sub _running_under {
+ my $thing = shift;
+ print <<"END_MESSAGE";
+*** Since we're running under ${thing}, I'll just let it take care
+ of the dependency's installation later.
+END_MESSAGE
+ return 1;
+}
+
# Check to see if we are currently running under CPAN.pm and/or CPANPLUS;
# if we are, then we simply let it taking care of our dependencies
sub _check_lock {
return unless @Missing or @_;
+ my $cpan_env = $ENV{PERL5_CPAN_IS_RUNNING};
+
if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) {
- print <<'END_MESSAGE';
+ return _running_under($cpan_env ? 'CPAN' : 'CPANPLUS');
+ }
-*** Since we're running under CPANPLUS, I'll just let it take care
- of the dependency's installation later.
-END_MESSAGE
- return 1;
+ require CPAN;
+
+ if ($CPAN::VERSION > '1.89') {
+ if ($cpan_env) {
+ return _running_under('CPAN');
+ }
+ return; # CPAN.pm new enough, don't need to check further
}
- _load_cpan();
+ # last ditch attempt, this -will- configure CPAN, very sorry
+
+ _load_cpan(1); # force initialize even though it's already loaded
# Find the CPAN lock-file
my $lock = MM->catfile( $CPAN::Config->{cpan_home}, ".lock" );
@@ -285,7 +321,7 @@
while ( my ( $pkg, $ver ) = splice( @_, 0, 2 ) ) {
# grep out those already installed
- if ( defined( _version_check( _load($pkg), $ver ) ) ) {
+ if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
push @installed, $pkg;
}
else {
@@ -324,7 +360,7 @@
# see if we have successfully installed them
while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
- if ( defined( _version_check( _load($pkg), $ver ) ) ) {
+ if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
push @installed, $pkg;
}
elsif ( $args{do_once} and open( FAILED, '>> .#autoinstall.failed' ) ) {
@@ -379,7 +415,7 @@
my $success;
my $obj = $modtree->{$pkg};
- if ( $obj and defined( _version_check( $obj->{version}, $ver ) ) ) {
+ if ( $obj and _version_cmp( $obj->{version}, $ver ) >= 0 ) {
my $pathname = $pkg;
$pathname =~ s/::/\\W/;
@@ -472,7 +508,7 @@
my $obj = CPAN::Shell->expand( Module => $pkg );
my $success = 0;
- if ( $obj and defined( _version_check( $obj->cpan_version, $ver ) ) ) {
+ if ( $obj and _version_cmp( $obj->cpan_version, $ver ) >= 0 ) {
my $pathname = $pkg;
$pathname =~ s/::/\\W/;
@@ -536,7 +572,7 @@
my $ver = shift;
return
- if defined( _version_check( _load($class), $ver ) ); # no need to upgrade
+ if _version_cmp( _load($class), $ver ) >= 0; # no need to upgrade
if (
_prompt( "==> A newer version of $class ($ver) is required. Install?",
@@ -633,7 +669,7 @@
# Load CPAN.pm and it's configuration
sub _load_cpan {
- return if $CPAN::VERSION;
+ return if $CPAN::VERSION and $CPAN::Config and not @_;
require CPAN;
if ( $CPAN::HandleConfig::VERSION ) {
# Newer versions of CPAN have a HandleConfig module
@@ -645,9 +681,11 @@
}
# compare two versions, either use Sort::Versions or plain comparison
-sub _version_check {
+# return values same as <=>
+sub _version_cmp {
my ( $cur, $min ) = @_;
- return unless defined $cur;
+ return -1 unless defined $cur; # if 0 keep comparing
+ return 1 unless $min;
$cur =~ s/\s+$//;
@@ -658,16 +696,13 @@
) {
# use version.pm if it is installed.
- return (
- ( version->new($cur) >= version->new($min) ) ? $cur : undef );
+ return version->new($cur) <=> version->new($min);
[...3605 lines suppressed...]
+
+
+#####################################################################
+# Testing and Configuration Contexts
+
+=pod
+
+=head2 interactive
+
+The C<interactive> function tests for an install that has a user present
+(or at least, one in which it is reasonable for us to present prompts
+and other similar types of things).
+
+Returns true if in an interactive environment, or false otherwise.
+
+=cut
+
+sub interactive {
+ # Treat things interactively ONLY based on input
+ !! (-t STDIN and ! automated_testing());
+}
+
+=pod
+
+=head2 automated_testing
+
+Are we currently running in an automated testing environment, such as
+CPAN Testers.
+
+This is primarily a cleaner and more human-readable equivalent of
+checking $ENV{AUTOMATED_TESTING} yourself, but may be improved in line
+with best practices at a later date.
+
+=cut
+
+sub automated_testing {
+ !! $ENV{AUTOMATED_TESTING};
+}
+
+=pod
+
+=head2 release_testing
+
+Are we currently running in an release testing environment. That is,
+are we in the process of running in a potential highly-intensive and
+high dependency bloat testing process prior to packaging a module for
+release.
+
+This is primarily a cleaner and more human-readable equivalent of
+checking $ENV{RELEASE_TESTING} yourself, but may be improved in line
+with best practices at a later date.
+
+=cut
+
+sub release_testing {
+ !! $ENV{RELEASE_TESTING};
+}
+
+sub author_context {
+ !! $Module::Install::AUTHOR;
+}
+
+
+
+
+
+#####################################################################
+# Operating System Convenience
+
+=pod
+
+=head2 win32
+
+The C<win32> function tests if the Makefile.PL is currently running in a
+native Microsoft Windows Perl, such as ActivePerl or Strawberry Perl.
+
+This is primarily a cleaner and more human-readable equivalent of
+checking C<$^O eq 'MSWin32'> yourself, but may be improved in line
+with best practices at a later date.
+
+=cut
+
+sub win32 {
+ !! ($^O eq 'MSWin32');
+}
+
+=pod
+
+=head2 winlike
+
+The C<winlike> function tests if the Makefile.PL is currently running
+in a Microsoft Windows Perl, under either cygwin or a native Win32 Perl.
+
+This is primarily a cleaner and more human-readable equivalent of
+checking C<$^O eq 'MSWin32' or $^O eq 'cygwin'>yourself, but may be
+improved in line with best practices at a later date.
+
+=cut
+
+sub winlike {
+ !! ($^O eq 'MSWin32' or $^O eq 'cygwin');
+}
+
+1;
+
+=pod
+
+=head1 SEE ALSO
+
+L<Module::Install>
+
+=head1 AUTHORS
+
+Adam Kennedy E<lt>adamk(a)cpan.orgE<gt>
+
+=head1 COPYRIGHT
+
+Copyright 2007 - 2009 Adam Kennedy.
+
+This program is free software; you can redistribute
+it and/or modify it under the same terms as Perl itself.
+
+The full text of the license can be found in the
+LICENSE file included with this module.
+
+=cut
diff -Naur Data-ICal-0.16.orig/inc/Module/Install/WriteAll.pm Data-ICal-0.16/inc/Module/Install/WriteAll.pm
--- Data-ICal-0.16.orig/inc/Module/Install/WriteAll.pm 2009-07-10 16:52:30.000000000 +0200
+++ Data-ICal-0.16/inc/Module/Install/WriteAll.pm 2009-05-27 18:46:13.000000000 +0200
@@ -1,12 +1,11 @@
-#line 1
package Module::Install::WriteAll;
use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.85';
+ $VERSION = '0.91';;
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
@@ -41,8 +40,18 @@
# The Makefile write process adds a couple of dependencies,
# so write the META.yml files after the Makefile.
- $self->Meta->write if $args{meta};
- $self->Meta->write_mymeta if $self->mymeta;
+ if ( $args{meta} ) {
+ $self->Meta->write;
+ }
+
+ # Experimental support for MYMETA
+ if ( $ENV{X_MYMETA} ) {
+ if ( $ENV{X_MYMETA} eq 'JSON' ) {
+ $self->Meta->write_mymeta_json;
+ } else {
+ $self->Meta->write_mymeta_yaml;
+ }
+ }
return 1;
}
diff -Naur Data-ICal-0.16.orig/inc/Module/Install.pm Data-ICal-0.16/inc/Module/Install.pm
--- Data-ICal-0.16.orig/inc/Module/Install.pm 2009-07-10 16:52:28.000000000 +0200
+++ Data-ICal-0.16/inc/Module/Install.pm 2009-07-29 09:44:13.000000000 +0200
@@ -1,4 +1,3 @@
-#line 1
package Module::Install;
# For any maintainers:
@@ -28,7 +27,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '0.85';
+ $VERSION = '0.91';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -353,7 +352,7 @@
if ( $] >= 5.006 ) {
open( FH, '<', $_[0] ) or die "open($_[0]): $!";
} else {
- open( FH, "< $_[0]" ) or die "open($_[0]): $!";
+ open( FH, "< $_[0]" ) or die "open($_[0]): $!";
}
my $string = do { local $/; <FH> };
close FH or die "close($_[0]): $!";
@@ -384,7 +383,7 @@
if ( $] >= 5.006 ) {
open( FH, '>', $_[0] ) or die "open($_[0]): $!";
} else {
- open( FH, "> $_[0]" ) or die "open($_[0]): $!";
+ open( FH, "> $_[0]" ) or die "open($_[0]): $!";
}
foreach ( 1 .. $#_ ) {
print FH $_[$_] or die "print($_[0]): $!";
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-ICal/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 3 Mar 2009 15:22:52 -0000 1.3
+++ .cvsignore 29 Jul 2009 08:21:50 -0000 1.4
@@ -1 +1 @@
-Data-ICal-0.15.tar.gz
+Data-ICal-0.16.tar.gz
Index: perl-Data-ICal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-ICal/F-11/perl-Data-ICal.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-Data-ICal.spec 3 Mar 2009 15:22:52 -0000 1.5
+++ perl-Data-ICal.spec 29 Jul 2009 08:21:50 -0000 1.6
@@ -1,13 +1,19 @@
Name: perl-Data-ICal
-Version: 0.15
+Version: 0.16
Release: 1%{?dist}
Summary: Generates iCalendar (RFC 2445) calendar files
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Data-ICal/
Source0: http://www.cpan.org/authors/id/A/AL/ALEXMV/Data-ICal-%{version}.tar.gz
+
+# inc/Module/Install* is broken, replace it with Module-Install-0.91
+Patch0: Data-ICal-%{version}.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
+
+BuildRequires: perl(CPAN) perl(YAML::Tiny) perl(File::Remove)
+
BuildRequires: perl(Class::Accessor)
BuildRequires: perl(Class::ReturnValue)
BuildRequires: perl(ExtUtils::MakeMaker)
@@ -32,9 +38,10 @@ many popular calendaring programs such a
%prep
%setup -q -n Data-ICal-%{version}
+%patch0 -p1
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+%{__perl} Makefile.PL INSTALLDIRS=vendor --skipdeps
make %{?_smp_mflags}
%install
@@ -60,6 +67,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/*
%changelog
+* Wed Jul 29 2009 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 0.16-1
+- Upstream update.
+- Replace broken inc/Module/Install/* with a copy of Module::Install-0.91.
+
* Tue Mar 03 2009 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 0.15-1
- Upstream update.
- Reflect upstream maintainer having changed.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-ICal/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 3 Mar 2009 15:22:52 -0000 1.3
+++ sources 29 Jul 2009 08:21:50 -0000 1.4
@@ -1 +1 @@
-71c830a2da27163d770b5c17fcc11541 Data-ICal-0.15.tar.gz
+12430864424a7bfe77e5d62a083f792c Data-ICal-0.16.tar.gz
14 years, 10 months
rpms/perl-Data-ICal/devel Data-ICal-0.16.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 perl-Data-ICal.spec, 1.6, 1.7 sources, 1.3, 1.4
by corsepiu
Author: corsepiu
Update of /cvs/pkgs/rpms/perl-Data-ICal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14606
Modified Files:
.cvsignore perl-Data-ICal.spec sources
Added Files:
Data-ICal-0.16.diff
Log Message:
* Wed Jul 29 2009 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 0.16-1
- Upstream update.
- Replace broken inc/Module/Install/* with a copy of Module::Install-0.91.
Data-ICal-0.16.diff:
AutoInstall.pm | 341 ++++++++++++++++++++++++++++++++++++++++++----
Install.pm | 7
Install/Admin.pm | 294 +++++++++++++++++++++++++++++++++++++++
Install/Admin/Bundle.pm | 73 +++++++++
Install/Admin/Compiler.pm | 27 +++
Install/Admin/Find.pm | 77 ++++++++++
Install/Admin/Include.pm | 147 +++++++++++++++++++
Install/Admin/Makefile.pm | 53 +++++++
Install/Admin/Manifest.pm | 162 +++++++++++++++++++++
Install/Admin/Metadata.pm | 185 ++++++++++++++++++++++++
Install/Admin/ScanDeps.pm | 80 ++++++++++
Install/Admin/WriteAll.pm | 20 ++
Install/AutoInstall.pm | 9 -
Install/Base.pm | 116 ++++++++++++---
Install/Bundle.pm | 195 ++++++++++++++++++++++++++
Install/Can.pm | 93 +++++++++++-
Install/Compiler.pm | 123 ++++++++++++++++
Install/DSL.pm | 91 ++++++++++++
Install/Deprecated.pm | 115 +++++++++++++++
Install/External.pm | 138 ++++++++++++++++++
Install/Fetch.pm | 9 -
Install/Include.pm | 9 -
Install/Inline.pm | 49 ++++++
Install/MakeMaker.pm | 49 ++++++
Install/Makefile.pm | 140 +++++++++++++++++-
Install/Metadata.pm | 105 +++++++++-----
Install/PAR.pm | 274 ++++++++++++++++++++++++++++++++++++
Install/Philosophy.pod | 187 +++++++++++++++++++++++++
Install/Run.pm | 15 ++
Install/Scripts.pm | 28 +++
Install/Share.pm | 125 ++++++++++++++++
Install/Win32.pm | 7
Install/With.pm | 159 +++++++++++++++++++++
Install/WriteAll.pm | 19 +-
34 files changed, 3395 insertions(+), 126 deletions(-)
--- NEW FILE Data-ICal-0.16.diff ---
diff -Naur Data-ICal-0.16.orig/inc/Module/AutoInstall.pm Data-ICal-0.16/inc/Module/AutoInstall.pm
--- Data-ICal-0.16.orig/inc/Module/AutoInstall.pm 2009-07-10 16:52:29.000000000 +0200
+++ Data-ICal-0.16/inc/Module/AutoInstall.pm 2009-07-29 09:44:08.000000000 +0200
@@ -1,4 +1,3 @@
-#line 1
package Module::AutoInstall;
use strict;
@@ -18,7 +17,9 @@
# various lexical flags
my ( @Missing, @Existing, %DisabledTests, $UnderCPAN, $HasCPANPLUS );
-my ( $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly );
+my (
+ $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps
+);
my ( $PostambleActions, $PostambleUsed );
# See if it's a testing or non-interactive session
@@ -73,6 +74,9 @@
elsif ( $arg =~ /^--test(?:only)?$/ ) {
$TestOnly = 1;
}
+ elsif ( $arg =~ /^--all(?:deps)?$/ ) {
+ $AllDeps = 1;
+ }
}
}
@@ -115,7 +119,12 @@
)[0]
);
- $UnderCPAN = _check_lock(1); # check for $UnderCPAN
+ # We want to know if we're under CPAN early to avoid prompting, but
+ # if we aren't going to try and install anything anyway then skip the
+ # check entirely since we don't want to have to load (and configure)
+ # an old CPAN just for a cosmetic message
+
+ $UnderCPAN = _check_lock(1) unless $SkipInstall;
while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) {
my ( @required, @tests, @skiptests );
@@ -165,15 +174,24 @@
}
# XXX: check for conflicts and uninstalls(!) them.
- if (
- defined( my $cur = _version_check( _load($mod), $arg ||= 0 ) ) )
+ my $cur = _load($mod);
+ if (_version_cmp ($cur, $arg) >= 0)
{
print "loaded. ($cur" . ( $arg ? " >= $arg" : '' ) . ")\n";
push @Existing, $mod => $arg;
$DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
}
else {
- print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n";
+ if (not defined $cur) # indeed missing
+ {
+ print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n";
+ }
+ else
+ {
+ # no need to check $arg as _version_cmp ($cur, undef) would satisfy >= above
+ print "too old. ($cur < $arg)\n";
+ }
+
push @required, $mod => $arg;
}
}
@@ -187,6 +205,7 @@
and (
$CheckOnly
or ($mandatory and $UnderCPAN)
+ or $AllDeps
or _prompt(
qq{==> Auto-install the }
. ( @required / 2 )
@@ -235,21 +254,38 @@
*{'main::WriteMakefile'} = \&Write if caller(0) eq 'main';
}
+sub _running_under {
+ my $thing = shift;
+ print <<"END_MESSAGE";
+*** Since we're running under ${thing}, I'll just let it take care
+ of the dependency's installation later.
+END_MESSAGE
+ return 1;
+}
+
# Check to see if we are currently running under CPAN.pm and/or CPANPLUS;
# if we are, then we simply let it taking care of our dependencies
sub _check_lock {
return unless @Missing or @_;
+ my $cpan_env = $ENV{PERL5_CPAN_IS_RUNNING};
+
if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) {
- print <<'END_MESSAGE';
+ return _running_under($cpan_env ? 'CPAN' : 'CPANPLUS');
+ }
-*** Since we're running under CPANPLUS, I'll just let it take care
- of the dependency's installation later.
-END_MESSAGE
- return 1;
+ require CPAN;
+
+ if ($CPAN::VERSION > '1.89') {
+ if ($cpan_env) {
+ return _running_under('CPAN');
+ }
+ return; # CPAN.pm new enough, don't need to check further
}
- _load_cpan();
+ # last ditch attempt, this -will- configure CPAN, very sorry
+
+ _load_cpan(1); # force initialize even though it's already loaded
# Find the CPAN lock-file
my $lock = MM->catfile( $CPAN::Config->{cpan_home}, ".lock" );
@@ -285,7 +321,7 @@
while ( my ( $pkg, $ver ) = splice( @_, 0, 2 ) ) {
# grep out those already installed
- if ( defined( _version_check( _load($pkg), $ver ) ) ) {
+ if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
push @installed, $pkg;
}
else {
@@ -324,7 +360,7 @@
# see if we have successfully installed them
while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
- if ( defined( _version_check( _load($pkg), $ver ) ) ) {
+ if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
push @installed, $pkg;
}
elsif ( $args{do_once} and open( FAILED, '>> .#autoinstall.failed' ) ) {
@@ -379,7 +415,7 @@
my $success;
my $obj = $modtree->{$pkg};
- if ( $obj and defined( _version_check( $obj->{version}, $ver ) ) ) {
+ if ( $obj and _version_cmp( $obj->{version}, $ver ) >= 0 ) {
my $pathname = $pkg;
$pathname =~ s/::/\\W/;
@@ -472,7 +508,7 @@
my $obj = CPAN::Shell->expand( Module => $pkg );
my $success = 0;
- if ( $obj and defined( _version_check( $obj->cpan_version, $ver ) ) ) {
+ if ( $obj and _version_cmp( $obj->cpan_version, $ver ) >= 0 ) {
my $pathname = $pkg;
$pathname =~ s/::/\\W/;
@@ -536,7 +572,7 @@
my $ver = shift;
return
- if defined( _version_check( _load($class), $ver ) ); # no need to upgrade
+ if _version_cmp( _load($class), $ver ) >= 0; # no need to upgrade
if (
_prompt( "==> A newer version of $class ($ver) is required. Install?",
@@ -633,7 +669,7 @@
# Load CPAN.pm and it's configuration
sub _load_cpan {
- return if $CPAN::VERSION;
+ return if $CPAN::VERSION and $CPAN::Config and not @_;
require CPAN;
if ( $CPAN::HandleConfig::VERSION ) {
# Newer versions of CPAN have a HandleConfig module
@@ -645,9 +681,11 @@
}
# compare two versions, either use Sort::Versions or plain comparison
-sub _version_check {
+# return values same as <=>
+sub _version_cmp {
my ( $cur, $min ) = @_;
- return unless defined $cur;
+ return -1 unless defined $cur; # if 0 keep comparing
+ return 1 unless $min;
$cur =~ s/\s+$//;
@@ -658,16 +696,13 @@
) {
# use version.pm if it is installed.
- return (
- ( version->new($cur) >= version->new($min) ) ? $cur : undef );
+ return version->new($cur) <=> version->new($min);
[...3605 lines suppressed...]
+
+
+#####################################################################
+# Testing and Configuration Contexts
+
+=pod
+
+=head2 interactive
+
+The C<interactive> function tests for an install that has a user present
+(or at least, one in which it is reasonable for us to present prompts
+and other similar types of things).
+
+Returns true if in an interactive environment, or false otherwise.
+
+=cut
+
+sub interactive {
+ # Treat things interactively ONLY based on input
+ !! (-t STDIN and ! automated_testing());
+}
+
+=pod
+
+=head2 automated_testing
+
+Are we currently running in an automated testing environment, such as
+CPAN Testers.
+
+This is primarily a cleaner and more human-readable equivalent of
+checking $ENV{AUTOMATED_TESTING} yourself, but may be improved in line
+with best practices at a later date.
+
+=cut
+
+sub automated_testing {
+ !! $ENV{AUTOMATED_TESTING};
+}
+
+=pod
+
+=head2 release_testing
+
+Are we currently running in an release testing environment. That is,
+are we in the process of running in a potential highly-intensive and
+high dependency bloat testing process prior to packaging a module for
+release.
+
+This is primarily a cleaner and more human-readable equivalent of
+checking $ENV{RELEASE_TESTING} yourself, but may be improved in line
+with best practices at a later date.
+
+=cut
+
+sub release_testing {
+ !! $ENV{RELEASE_TESTING};
+}
+
+sub author_context {
+ !! $Module::Install::AUTHOR;
+}
+
+
+
+
+
+#####################################################################
+# Operating System Convenience
+
+=pod
+
+=head2 win32
+
+The C<win32> function tests if the Makefile.PL is currently running in a
+native Microsoft Windows Perl, such as ActivePerl or Strawberry Perl.
+
+This is primarily a cleaner and more human-readable equivalent of
+checking C<$^O eq 'MSWin32'> yourself, but may be improved in line
+with best practices at a later date.
+
+=cut
+
+sub win32 {
+ !! ($^O eq 'MSWin32');
+}
+
+=pod
+
+=head2 winlike
+
+The C<winlike> function tests if the Makefile.PL is currently running
+in a Microsoft Windows Perl, under either cygwin or a native Win32 Perl.
+
+This is primarily a cleaner and more human-readable equivalent of
+checking C<$^O eq 'MSWin32' or $^O eq 'cygwin'>yourself, but may be
+improved in line with best practices at a later date.
+
+=cut
+
+sub winlike {
+ !! ($^O eq 'MSWin32' or $^O eq 'cygwin');
+}
+
+1;
+
+=pod
+
+=head1 SEE ALSO
+
+L<Module::Install>
+
+=head1 AUTHORS
+
+Adam Kennedy E<lt>adamk(a)cpan.orgE<gt>
+
+=head1 COPYRIGHT
+
+Copyright 2007 - 2009 Adam Kennedy.
+
+This program is free software; you can redistribute
+it and/or modify it under the same terms as Perl itself.
+
+The full text of the license can be found in the
+LICENSE file included with this module.
+
+=cut
diff -Naur Data-ICal-0.16.orig/inc/Module/Install/WriteAll.pm Data-ICal-0.16/inc/Module/Install/WriteAll.pm
--- Data-ICal-0.16.orig/inc/Module/Install/WriteAll.pm 2009-07-10 16:52:30.000000000 +0200
+++ Data-ICal-0.16/inc/Module/Install/WriteAll.pm 2009-05-27 18:46:13.000000000 +0200
@@ -1,12 +1,11 @@
-#line 1
package Module::Install::WriteAll;
use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.85';
+ $VERSION = '0.91';;
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
@@ -41,8 +40,18 @@
# The Makefile write process adds a couple of dependencies,
# so write the META.yml files after the Makefile.
- $self->Meta->write if $args{meta};
- $self->Meta->write_mymeta if $self->mymeta;
+ if ( $args{meta} ) {
+ $self->Meta->write;
+ }
+
+ # Experimental support for MYMETA
+ if ( $ENV{X_MYMETA} ) {
+ if ( $ENV{X_MYMETA} eq 'JSON' ) {
+ $self->Meta->write_mymeta_json;
+ } else {
+ $self->Meta->write_mymeta_yaml;
+ }
+ }
return 1;
}
diff -Naur Data-ICal-0.16.orig/inc/Module/Install.pm Data-ICal-0.16/inc/Module/Install.pm
--- Data-ICal-0.16.orig/inc/Module/Install.pm 2009-07-10 16:52:28.000000000 +0200
+++ Data-ICal-0.16/inc/Module/Install.pm 2009-07-29 09:44:13.000000000 +0200
@@ -1,4 +1,3 @@
-#line 1
package Module::Install;
# For any maintainers:
@@ -28,7 +27,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '0.85';
+ $VERSION = '0.91';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -353,7 +352,7 @@
if ( $] >= 5.006 ) {
open( FH, '<', $_[0] ) or die "open($_[0]): $!";
} else {
- open( FH, "< $_[0]" ) or die "open($_[0]): $!";
+ open( FH, "< $_[0]" ) or die "open($_[0]): $!";
}
my $string = do { local $/; <FH> };
close FH or die "close($_[0]): $!";
@@ -384,7 +383,7 @@
if ( $] >= 5.006 ) {
open( FH, '>', $_[0] ) or die "open($_[0]): $!";
} else {
- open( FH, "> $_[0]" ) or die "open($_[0]): $!";
+ open( FH, "> $_[0]" ) or die "open($_[0]): $!";
}
foreach ( 1 .. $#_ ) {
print FH $_[$_] or die "print($_[0]): $!";
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-ICal/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 3 Mar 2009 15:22:52 -0000 1.3
+++ .cvsignore 29 Jul 2009 08:10:10 -0000 1.4
@@ -1 +1 @@
-Data-ICal-0.15.tar.gz
+Data-ICal-0.16.tar.gz
Index: perl-Data-ICal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-ICal/devel/perl-Data-ICal.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- perl-Data-ICal.spec 26 Jul 2009 05:29:11 -0000 1.6
+++ perl-Data-ICal.spec 29 Jul 2009 08:10:10 -0000 1.7
@@ -1,13 +1,19 @@
Name: perl-Data-ICal
-Version: 0.15
-Release: 2%{?dist}
+Version: 0.16
+Release: 1%{?dist}
Summary: Generates iCalendar (RFC 2445) calendar files
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Data-ICal/
Source0: http://www.cpan.org/authors/id/A/AL/ALEXMV/Data-ICal-%{version}.tar.gz
+
+# inc/Module/Install* is broken, replace it with Module-Install-0.91
+Patch0: Data-ICal-%{version}.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
+
+BuildRequires: perl(CPAN) perl(YAML::Tiny) perl(File::Remove)
+
BuildRequires: perl(Class::Accessor)
BuildRequires: perl(Class::ReturnValue)
BuildRequires: perl(ExtUtils::MakeMaker)
@@ -32,9 +38,10 @@ many popular calendaring programs such a
%prep
%setup -q -n Data-ICal-%{version}
+%patch0 -p1
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+%{__perl} Makefile.PL INSTALLDIRS=vendor --skipdeps
make %{?_smp_mflags}
%install
@@ -60,6 +67,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/*
%changelog
+* Wed Jul 29 2009 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 0.16-1
+- Upstream update.
+- Replace broken inc/Module/Install/* with a copy of Module::Install-0.91.
+
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Data-ICal/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 3 Mar 2009 15:22:52 -0000 1.3
+++ sources 29 Jul 2009 08:10:10 -0000 1.4
@@ -1 +1 @@
-71c830a2da27163d770b5c17fcc11541 Data-ICal-0.15.tar.gz
+12430864424a7bfe77e5d62a083f792c Data-ICal-0.16.tar.gz
14 years, 10 months
rpms/perl-prefork/F-10 .cvsignore, 1.5, 1.6 perl-prefork.spec, 1.9, 1.10 sources, 1.5, 1.6
by corsepiu
Author: corsepiu
Update of /cvs/pkgs/rpms/perl-prefork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1542/F-10
Modified Files:
.cvsignore perl-prefork.spec sources
Log Message:
* Wed Jul 29 2009 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 1.04-1
- Upstream update.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-prefork/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 18 Jun 2009 03:33:09 -0000 1.5
+++ .cvsignore 29 Jul 2009 05:02:40 -0000 1.6
@@ -1 +1 @@
-prefork-1.03.tar.gz
+prefork-1.04.tar.gz
Index: perl-prefork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-prefork/F-10/perl-prefork.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- perl-prefork.spec 18 Jun 2009 03:33:09 -0000 1.9
+++ perl-prefork.spec 29 Jul 2009 05:02:40 -0000 1.10
@@ -1,5 +1,5 @@
Name: perl-prefork
-Version: 1.03
+Version: 1.04
Release: 1%{?dist}
Summary: Optimized module loading for forking or non-forking processes
License: GPL+ or Artistic
@@ -13,7 +13,8 @@ BuildArch: noarch
BuildRequires: perl(Test::More) >= 0.47
BuildRequires: perl(File::Spec) >= 0.80
-BuildRequires: perl(Scalar::Util) >= 1.10
+BuildRequires: perl(List::Util) >= 0.18
+BuildRequires: perl(Scalar::Util) >= 1.18
# Required by tests
BuildRequires: perl(Test::Pod) >= 1.00
@@ -55,6 +56,9 @@ make test AUTOMATED_TESTING=1
%{_mandir}/man3/*
%changelog
+* Wed Jul 29 2009 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 1.04-1
+- Upstream update.
+
* Thu Jun 18 2009 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 1.03-1
- Upstream update.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-prefork/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 18 Jun 2009 03:33:09 -0000 1.5
+++ sources 29 Jul 2009 05:02:40 -0000 1.6
@@ -1 +1 @@
-8d0ca2f8b4a6d0c7489a5bd8101899b4 prefork-1.03.tar.gz
+47a514d4058ffc8cca184b28d6d54d0a prefork-1.04.tar.gz
14 years, 10 months
rpms/perl-prefork/F-11 .cvsignore, 1.5, 1.6 perl-prefork.spec, 1.10, 1.11 sources, 1.5, 1.6
by corsepiu
Author: corsepiu
Update of /cvs/pkgs/rpms/perl-prefork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1542/F-11
Modified Files:
.cvsignore perl-prefork.spec sources
Log Message:
* Wed Jul 29 2009 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 1.04-1
- Upstream update.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-prefork/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 18 Jun 2009 03:33:08 -0000 1.5
+++ .cvsignore 29 Jul 2009 05:02:40 -0000 1.6
@@ -1 +1 @@
-prefork-1.03.tar.gz
+prefork-1.04.tar.gz
Index: perl-prefork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-prefork/F-11/perl-prefork.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- perl-prefork.spec 18 Jun 2009 03:33:08 -0000 1.10
+++ perl-prefork.spec 29 Jul 2009 05:02:40 -0000 1.11
@@ -1,5 +1,5 @@
Name: perl-prefork
-Version: 1.03
+Version: 1.04
Release: 1%{?dist}
Summary: Optimized module loading for forking or non-forking processes
License: GPL+ or Artistic
@@ -13,7 +13,8 @@ BuildArch: noarch
BuildRequires: perl(Test::More) >= 0.47
BuildRequires: perl(File::Spec) >= 0.80
-BuildRequires: perl(Scalar::Util) >= 1.10
+BuildRequires: perl(List::Util) >= 0.18
+BuildRequires: perl(Scalar::Util) >= 1.18
# Required by tests
BuildRequires: perl(Test::Pod) >= 1.00
@@ -55,6 +56,9 @@ make test AUTOMATED_TESTING=1
%{_mandir}/man3/*
%changelog
+* Wed Jul 29 2009 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 1.04-1
+- Upstream update.
+
* Thu Jun 18 2009 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 1.03-1
- Upstream update.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-prefork/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 18 Jun 2009 03:33:09 -0000 1.5
+++ sources 29 Jul 2009 05:02:40 -0000 1.6
@@ -1 +1 @@
-8d0ca2f8b4a6d0c7489a5bd8101899b4 prefork-1.03.tar.gz
+47a514d4058ffc8cca184b28d6d54d0a prefork-1.04.tar.gz
14 years, 10 months
rpms/perl-prefork/devel .cvsignore, 1.5, 1.6 perl-prefork.spec, 1.11, 1.12 sources, 1.5, 1.6
by corsepiu
Author: corsepiu
Update of /cvs/pkgs/rpms/perl-prefork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1051
Modified Files:
.cvsignore perl-prefork.spec sources
Log Message:
* Wed Jul 29 2009 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 1.04-1
- Upstream update.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/perl-prefork/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 18 Jun 2009 03:33:08 -0000 1.5
+++ .cvsignore 29 Jul 2009 05:00:29 -0000 1.6
@@ -1 +1 @@
-prefork-1.03.tar.gz
+prefork-1.04.tar.gz
Index: perl-prefork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-prefork/devel/perl-prefork.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- perl-prefork.spec 26 Jul 2009 17:50:21 -0000 1.11
+++ perl-prefork.spec 29 Jul 2009 05:00:29 -0000 1.12
@@ -1,6 +1,6 @@
Name: perl-prefork
-Version: 1.03
-Release: 2%{?dist}
+Version: 1.04
+Release: 1%{?dist}
Summary: Optimized module loading for forking or non-forking processes
License: GPL+ or Artistic
Group: Development/Libraries
@@ -13,7 +13,8 @@ BuildArch: noarch
BuildRequires: perl(Test::More) >= 0.47
BuildRequires: perl(File::Spec) >= 0.80
-BuildRequires: perl(Scalar::Util) >= 1.10
+BuildRequires: perl(List::Util) >= 0.18
+BuildRequires: perl(Scalar::Util) >= 1.18
# Required by tests
BuildRequires: perl(Test::Pod) >= 1.00
@@ -55,6 +56,9 @@ make test AUTOMATED_TESTING=1
%{_mandir}/man3/*
%changelog
+* Wed Jul 29 2009 Ralf Corsépius <corsepiu(a)fedoraproject.org> - 1.04-1
+- Upstream update.
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.03-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/perl-prefork/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 18 Jun 2009 03:33:08 -0000 1.5
+++ sources 29 Jul 2009 05:00:29 -0000 1.6
@@ -1 +1 @@
-8d0ca2f8b4a6d0c7489a5bd8101899b4 prefork-1.03.tar.gz
+47a514d4058ffc8cca184b28d6d54d0a prefork-1.04.tar.gz
14 years, 10 months