Hello community,
here is the log from the commit of package cpanspec for openSUSE:Factory
checked in at Wed Feb 2 02:11:52 CET 2011.
--------
--- cpanspec/cpanspec.changes 2010-12-03 13:54:00.000000000 +0100
+++ /mounts/work_src_done/STABLE/cpanspec/cpanspec.changes 2011-02-01 14:19:57.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Feb 1 13:19:36 UTC 2011 - chris@computersalat.de
+
+- fix cpanspec
+ * e.g. `cpanspec Devel::StackTrace` resulted in
+ (Could not create filehandle for 'Devel::StackTrace')
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cpanspec.spec ++++++
--- /var/tmp/diff_new_pack.lmoAwu/_old 2011-02-02 02:11:20.000000000 +0100
+++ /var/tmp/diff_new_pack.lmoAwu/_new 2011-02-02 02:11:20.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package cpanspec (Version 1.78)
+# spec file for package cpanspec
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Name: cpanspec
Version: 1.78
-Release: 3
+Release: 4
%define tar_version 1.78
Summary: Generate a SUSE spec file for a CPAN module
License: GPL+ or Artistic
++++++ cpanspec.patch ++++++
--- /var/tmp/diff_new_pack.lmoAwu/_old 2011-02-02 02:11:20.000000000 +0100
+++ /var/tmp/diff_new_pack.lmoAwu/_new 2011-02-02 02:11:20.000000000 +0100
@@ -1,13 +1,6 @@
-Index: cpanspec-1.78/cpanspec
-===================================================================
---- cpanspec-1.78.orig/cpanspec 2009-01-16 21:35:55.000000000 +0100
-+++ cpanspec-1.78/cpanspec 2010-12-03 13:53:40.285718266 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/bin/perl
- #
- # cpanspec - Generate a spec file for a CPAN module
- #
+diff -ruN cpanspec-1.78-orig/cpanspec cpanspec-1.78/cpanspec
+--- cpanspec-1.78-orig/cpanspec 2009-01-16 21:35:55.000000000 +0100
++++ cpanspec-1.78/cpanspec 2011-02-01 14:18:48.000000000 +0100
@@ -12,9 +12,6 @@
#
# $Id: cpanspec,v 1.67 2009/01/16 20:35:17 stevenpritchard Exp $
@@ -18,7 +11,7 @@
=head1 NAME
cpanspec - Generate a spec file for a CPAN module
-@@ -191,6 +188,9 @@ L, L, Lhttp://www.cpan.org";
our $home=$ENV{'HOME'} || (getpwuid($<))[7];
-@@ -241,6 +241,8 @@ our @add_requires;
+@@ -241,6 +241,8 @@
our @add_provides;
our @add_buildrequires;
@@ -61,7 +54,7 @@
# env. vars and their macro analogues
my @MACROS = (
-@@ -252,7 +254,7 @@ my @MACROS = (
+@@ -252,7 +254,7 @@
# 1 is for the macros.
{
@@ -70,7 +63,7 @@
'buildroot' => '%{buildroot}',
},
);
-@@ -338,6 +340,61 @@ sub update_packages() {
+@@ -338,6 +340,62 @@
$updated=1;
}
@@ -90,6 +83,7 @@
+ $name=$d->dist();
+ $version=$d->version();
+ $version=~s/^v\.?//;
++ $source=~s/$version/\%{version}/;
+ if ($file =~ /\.(tar)\.(?:gz|bz2)$/i) {
+ $type=$1;
+ } elsif ($file =~ /\.tgz$/i) {
@@ -121,18 +115,18 @@
+ my ($m,$d);
+ if ($m=$packages->package($file) and $d=$m->distribution()) {
+ $source=$cpan . "/authors/id/" . $d->prefix();
-+ $source=~s/$version/\%{version}/;
+ } else {
+ warn "Failed to parse '$file' or find a module by that name in $pkgdetails, skipping...\n";
+ $source='';
+ return;
+ }
++ $source=~s/$version/\%{version}/;
+}
+
sub build_rpm($) {
my $spec=shift;
my $dir=getcwd();
-@@ -387,10 +444,10 @@ sub extract($$$) {
+@@ -387,10 +445,10 @@
}
}
@@ -145,7 +139,7 @@
my $path=$args{module};
$path=~s,::,/,g;
-@@ -415,60 +472,95 @@ sub get_description(%) {
+@@ -415,60 +473,95 @@
last if $pm;
}
@@ -290,7 +284,7 @@
}
sub check_rpm($) {
-@@ -554,13 +646,6 @@ my $prefix=$noprefix ? "" : "perl-";
+@@ -554,13 +647,6 @@
$packager=$packager || `rpm --eval '\%packager'`;
@@ -304,29 +298,37 @@
our %corelist;
my $rpm=new FileHandle "rpm -q --provides perl|"
-@@ -578,17 +663,16 @@ my @args=@ARGV;
+@@ -577,67 +663,49 @@
+ my @args=@ARGV;
my @processed=();
- for my $file (@args) {
+-for my $file (@args) {
- my ($name,$version,$type);
++for my $ofile (@args) {
- if ($file =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)\.(tar)\.(?:gz|bz2)$/) {
-+ if ($file =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)\.(tar)\.(?:gz|bz2)$/i) {
++ if ($ofile =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)\.(tar)\.(?:gz|bz2)$/i) {
++ $file=$ofile;
$name=$1;
$version=$2;
$type=$3;
- } elsif ($file =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)\.tgz$/) {
-+ } elsif ($file =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)\.tgz$/i) {
++ } elsif ($ofile =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)\.tgz$/i) {
++ $file=$ofile;
$name=$1;
$version=$2;
$type = 'tar';
- } elsif ($file =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)\.(zip)$/) {
-+ } elsif ($file =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)\.(zip)$/i) {
++ } elsif ($ofile =~ /^(?:.*\/)?(.*)-(?:v\.?)?([^-]+)\.(zip)$/i) {
++ $file=$ofile;
$name=$1;
$version=$2;
$type=$3;
-@@ -598,46 +682,26 @@ for my $file (@args) {
- $file =~ s/-/::/g;
+ } else {
+
+ # keep things happy if we get "Foo-Bar" instead of "Foo::Bar"
+- $file =~ s/-/::/g;
++ $ofile =~ s/-/::/g;
# Look up $file in 02packages.details.txt.
- update_packages();
@@ -356,7 +358,7 @@
- warn "Failed to parse '$file' or find a module by that name, skipping...\n";
- next;
- }
-+ get_file($file);
++ get_file($ofile);
}
my $module=$name;
@@ -382,7 +384,7 @@
if ($@) {
warn "Failed to load IO::Uncompress::Bunzip2: $@\n";
-@@ -650,12 +714,14 @@ for my $file (@args) {
+@@ -650,12 +718,14 @@
warn "IO::Uncompress::Bunzip2->new() failed on $file: $!\n";
next;
}
@@ -397,7 +399,7 @@
}
my @files;
-@@ -684,12 +750,9 @@ for my $file (@args) {
+@@ -684,12 +754,9 @@
my $url="http://search.cpan.org/dist/$name/";
@@ -412,7 +414,7 @@
archive => $archive,
type => $type,
filename => $file,
-@@ -700,18 +763,13 @@ for my $file (@args) {
+@@ -700,18 +767,13 @@
path => $path,
);
@@ -437,7 +439,7 @@
my @doc=sort { $a cmp $b } grep {
!/\//
-@@ -722,6 +780,7 @@ for my $file (@args) {
+@@ -722,6 +784,7 @@
and $_ ne "MANIFEST.SKIP"
and $_ ne "INSTALL"
and $_ ne "SIGNATURE"
@@ -445,7 +447,7 @@
and $_ ne "META.yml"
and $_ ne "NINJA"
and $_ ne "configure"
-@@ -733,6 +792,8 @@ for my $file (@args) {
+@@ -733,6 +796,8 @@
and $_ ne "t"
and $_ ne "inc"
and $_ ne "autobuild.sh"
@@ -454,7 +456,7 @@
and $_ ne "pm_to_blib"
and $_ ne "install.sh"
} @files;
-@@ -947,45 +1008,61 @@ for my $file (@args) {
+@@ -947,45 +1012,61 @@
}
print $spec <= " . $requires{$dep}) if ($requires{$dep});
-@@ -1015,11 +1093,6 @@ END
+@@ -1015,11 +1097,6 @@
printf $spec "%-16s%s\n", "Requires:", $dep;
}
@@ -562,7 +564,7 @@
for my $prov (@add_provides) {
printf $spec "%-16s%s\n", "Provides:", $prov;
-@@ -1043,7 +1116,12 @@ Source99: $name-filter-provides.sh
+@@ -1043,7 +1120,12 @@
END
}
@@ -575,7 +577,7 @@
$buildpath=~s/$version/\%{version}/;
print $spec <close();
-@@ -1187,6 +1245,11 @@ END
+@@ -1187,6 +1249,11 @@
build_rpm($specfile) if ($buildsrpm or $buildrpm);
push(@processed, $module);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org