Hello community, here is the log from the commit of package cpanspec for openSUSE:Factory checked in at Thu Mar 24 17:39:46 CET 2011.
-------- --- cpanspec/cpanspec.changes 2011-02-01 14:19:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/cpanspec/cpanspec.changes 2011-02-20 02:02:20.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Feb 20 00:39:36 UTC 2011 - [email protected] + +- fix some perl errors + o cpanspec Cpan-Name + o cpanspec Cpan::Name + o cpanspec Cpan-Name-{version}.tar.gz + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cpanspec.spec ++++++ --- /var/tmp/diff_new_pack.q9B7rV/_old 2011-03-24 17:39:33.000000000 +0100 +++ /var/tmp/diff_new_pack.q9B7rV/_new 2011-03-24 17:39:33.000000000 +0100 @@ -20,7 +20,7 @@ Name: cpanspec Version: 1.78 -Release: 4 +Release: 19 %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.q9B7rV/_old 2011-03-24 17:39:33.000000000 +0100 +++ /var/tmp/diff_new_pack.q9B7rV/_new 2011-03-24 17:39:33.000000000 +0100 @@ -1,6 +1,6 @@ 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 ++++ cpanspec-1.78/cpanspec 2011-02-20 01:55:34.000000000 +0100 @@ -12,9 +12,6 @@ # # $Id: cpanspec,v 1.67 2009/01/16 20:35:17 stevenpritchard Exp $ @@ -115,12 +115,12 @@ + 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($) { @@ -250,7 +250,8 @@ } + return $summary="$mod Perl module"; +} -+ + +- return(undef, undef); +sub get_author($) { + my $cont = shift; + my @lines=(); @@ -275,8 +276,7 @@ + } + + $author = join "\n", @lines; - -- return(undef, undef); ++ + # return... + return $author; + } @@ -439,15 +439,21 @@ my @doc=sort { $a cmp $b } grep { !/\// -@@ -722,6 +784,7 @@ +@@ -722,17 +784,22 @@ and $_ ne "MANIFEST.SKIP" and $_ ne "INSTALL" and $_ ne "SIGNATURE" + and $_ ne "META.json" and $_ ne "META.yml" and $_ ne "NINJA" ++ and $_ ne "c" and $_ ne "configure" -@@ -733,6 +796,8 @@ + and $_ ne "config.guess" + and $_ ne "config.sub" ++ and $_ ne "dist.ini" + and $_ ne "typemap" + and $_ ne "bin" + and $_ ne "lib" and $_ ne "t" and $_ ne "inc" and $_ ne "autobuild.sh" @@ -456,7 +462,7 @@ and $_ ne "pm_to_blib" and $_ ne "install.sh" } @files; -@@ -947,45 +1012,61 @@ +@@ -947,45 +1014,63 @@ } print $spec <<END; @@ -503,8 +509,9 @@ +Source: \%{cpan_name}-\%{version}.tar$ext END - -- printf $spec "%-16s%s\n", "BuildArch:", "noarch" if ($noarch); -- + printf $spec "%-16s%s\n", "BuildArch:", "noarch" if ($noarch); ++ print $spec "BuildRoot: \%{_tmppath}/\%{name}-\%{version}-build\n"; + - if (defined($requires{perl})) { - $build_requires{perl}=$build_requires{perl} || $requires{perl}; - delete $requires{perl}; @@ -515,12 +522,11 @@ - (($build_requires{perl} lt "5.6.0" ? "0:" : "1:") - . $build_requires{perl}) if $build_requires{perl}; - delete $build_requires{perl}; -+ -+ push(@add_buildrequires, "perl"); -+ push(@add_buildrequires, "perl-macros"); ++ printf $spec "%-16s%s\n", "BuildRequires:", "perl"; + if ($usebuildpl) { -+ push(@add_buildrequires, "perl(Module::Build)"); ++ printf $spec "%-16s%s\n", "BuildRequires:", "perl(Module::Build)"; } ++ printf $spec "%-16s%s\n", "BuildRequires:", "perl-macros"; for my $dep (keys(%requires)) { + next if ($dep eq 'perl'); @@ -537,7 +543,7 @@ if (check_dep($dep)) { verbose("$dep is available, skipping."); } else { -@@ -1000,11 +1081,12 @@ +@@ -1000,11 +1085,12 @@ print $spec "\n"; } @@ -552,7 +558,7 @@ next if (!$compat and exists($corelist{$dep})); printf $spec "%-16s%s", "Requires:", "perl($dep)"; print $spec (" >= " . $requires{$dep}) if ($requires{$dep}); -@@ -1015,11 +1097,6 @@ +@@ -1015,11 +1101,6 @@ printf $spec "%-16s%s\n", "Requires:", $dep; } @@ -564,12 +570,10 @@ for my $prov (@add_provides) { printf $spec "%-16s%s\n", "Provides:", $prov; -@@ -1043,7 +1120,12 @@ +@@ -1043,7 +1124,10 @@ END } -+ print $spec "BuildRoot: \%{_tmppath}/\%{name}-\%{version}-build\n"; -+ printf $spec "%-16s%s\n", "BuildArch:", "noarch" if ($noarch); + print $spec "%{perl_requires}\n"; + my $buildpath=$path; @@ -577,7 +581,7 @@ $buildpath=~s/$version/\%{version}/; print $spec <<END; -@@ -1085,7 +1167,8 @@ +@@ -1085,7 +1169,8 @@ if ($usebuildpl) { print $spec <<END; \%{__perl} Build.PL installdirs=vendor@{[$noarch ? '' : qq{ optimize="$macro{optimize}"} ]} @@ -587,7 +591,7 @@ END } else { print $spec <<END; -@@ -1097,15 +1180,24 @@ +@@ -1097,15 +1182,24 @@ if ($compat and !$noarch); print $spec <<END; @@ -615,7 +619,7 @@ END if ($usebuildpl) { -@@ -1113,24 +1205,12 @@ +@@ -1113,24 +1207,12 @@ "./Build install destdir=$macro{buildroot} create_packlist=0\n"; } else { print $spec <<END; @@ -644,7 +648,7 @@ if ($addlicense and !grep /copying|artistic|copyright|license/i, @doc) { print $spec <<END; -@@ -1143,43 +1223,25 @@ +@@ -1143,43 +1225,27 @@ } print $spec <<END; @@ -669,8 +673,10 @@ -\%doc @doc +\%files -f \%{name}.files END -+ print $spec "\%defattr(644,root,root,755)\n"; -+ print $spec "%doc @doc\n" if (@doc); ++ if (@doc) { ++ print $spec "\%defattr(644,root,root,755)\n"; ++ print $spec "%doc @doc\n"; ++ } if ($scripts) { print $spec "\%{_bindir}/*\n"; @@ -692,7 +698,7 @@ END $spec->close(); -@@ -1187,6 +1249,11 @@ +@@ -1187,6 +1253,11 @@ build_rpm($specfile) if ($buildsrpm or $buildrpm); push(@processed, $module); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
