dinislage/cpanspec
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop dependency on Module::CoreList and just fetch the list from rpm.

Browse Source
This commit is contained in:
stevenpritchard committed 2008-06-16 18:43:22 +00:00
1 parent a06e38d230
commit 87c92858e7
3 files changed
+28 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Build.PL
-1
View File
@@ -16,7 +16,6 @@ my $builder = Module::Build->new(
'Getopt::Long' => 0, 'Getopt::Long' => 0,
'locale' => 0, 'locale' => 0,
'LWP::UserAgent' => 0, 'LWP::UserAgent' => 0,
'Module::CoreList' => 0,
'POSIX' => 0, 'POSIX' => 0,
'Parse::CPAN::Packages' => 0, 'Parse::CPAN::Packages' => 0,
'Pod::Simple::TextContent' => 0, 'Pod::Simple::TextContent' => 0,
Changes
+4
View File
@@ -1,3 +1,7 @@
1.76 2008-06-16
* Drop dependency on Module::CoreList and just fetch the list from rpm.
1.75 2008-05-05 1.75 2008-05-05
* Try $] as-is and numeric when we use it with Module::CoreList. * Try $] as-is and numeric when we use it with Module::CoreList.
cpanspec
+24 -20
View File
@@ -10,10 +10,10 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# #
# $Id: cpanspec,v 1.60 2008/05/05 20:17:50 stevenpritchard Exp $ # $Id: cpanspec,v 1.61 2008/06/16 18:43:22 stevenpritchard Exp $
our $NAME="cpanspec"; our $NAME="cpanspec";
our $VERSION='1.75'; our $VERSION='1.76';
=head1 NAME =head1 NAME
@@ -198,7 +198,6 @@ use POSIX;
use locale; use locale;
use Text::Autoformat; use Text::Autoformat;
use YAML qw(Load); use YAML qw(Load);
use Module::CoreList;
use Getopt::Long; use Getopt::Long;
use Pod::Usage; use Pod::Usage;
use File::Basename; use File::Basename;
@@ -343,23 +342,24 @@ sub build_rpm($) {
my $spec=shift; my $spec=shift;
my $dir=getcwd(); my $dir=getcwd();
my $rpm=(-x "/usr/bin/rpmbuild" ? "/usr/bin/rpmbuild" : "/bin/rpm"); my $rpmbuild=(-x "/usr/bin/rpmbuild" ? "/usr/bin/rpmbuild" : "/bin/rpm");
verbose("Building " . ($buildrpm ? "rpms" : "source rpm") . " from $spec"); verbose("Building " . ($buildrpm ? "rpms" : "source rpm") . " from $spec");
# From Fedora CVS Makefile.common. # From Fedora CVS Makefile.common.
if (system($rpm, "--define", "_sourcedir $dir", if (system($rpmbuild, "--define", "_sourcedir $dir",
"--define", "_builddir $dir", "--define", "_builddir $dir",
"--define", "_srcrpmdir $dir", "--define", "_srcrpmdir $dir",
"--define", "_rpmdir $dir", "--define", "_rpmdir $dir",
"--nodeps", ($buildrpm ? "-ba" : "-bs"), $spec) != 0) { "--nodeps", ($buildrpm ? "-ba" : "-bs"),
$spec) != 0) {
if ($? == -1) { if ($? == -1) {
die "Failed to execute $rpm: $!\n"; die "Failed to execute $rpmbuild: $!\n";
} elsif (WIFSIGNALED($?)) { } elsif (WIFSIGNALED($?)) {
die "$rpm died with signal " . WTERMSIG($?) die "$rpmbuild died with signal " . WTERMSIG($?)
. (($? & 128) ? ", core dumped\n" : "\n"); . (($? & 128) ? ", core dumped\n" : "\n");
} else { } else {
die "$rpm exited with value " . WEXITSTATUS($?) . "\n"; die "$rpmbuild exited with value " . WEXITSTATUS($?) . "\n";
} }
} }
} }
@@ -561,12 +561,16 @@ if (!$packager or $packager eq "\%packager") {
. " Please add or use --packager option.\n"; . " Please add or use --packager option.\n";
} }
my $perl_version=$]; our %corelist;
if (!exists($Module::CoreList::version{$perl_version})) { my $rpm=new FileHandle "rpm -q --provides perl|"
$perl_version+=0; or warn "Failed to execute rpm: $!\n";
if (!exists($Module::CoreList::version{$perl_version})) {
die "Module::CoreList does not support perl version $perl_version!\n"; while (my $provides=<$rpm>) {
chomp $provides;
if ($provides=~/^perl\(([^\)]+)\)(?:\s+=\s+(\S+))\s*$/) {
$corelist{$1}=defined($2) ? $2 : 0;
} }
} }
@@ -973,8 +977,8 @@ END
} }
for my $dep (sort(keys(%build_requires))) { for my $dep (sort(keys(%build_requires))) {
if (exists($Module::CoreList::version{$perl_version}{$dep})) { if (exists($corelist{$dep})) {
next if (!$compat and $dep ne "ExtUtils::MakeMaker"); next if (!$compat);
} elsif ($follow) { } elsif ($follow) {
if ($dep ne $module and !(grep { $_ eq $dep } @processed, @args)) { if ($dep ne $module and !(grep { $_ eq $dep } @processed, @args)) {
if (check_dep($dep)) { if (check_dep($dep)) {
@@ -996,7 +1000,7 @@ END
} }
for my $dep (sort(keys(%requires))) { for my $dep (sort(keys(%requires))) {
next if (!$compat and exists($Module::CoreList::version{$perl_version}{$dep})); next if (!$compat and exists($corelist{$dep}));
printf $spec "%-16s%s", "Requires:", "perl($dep)"; printf $spec "%-16s%s", "Requires:", "perl($dep)";
print $spec (" >= " . $requires{$dep}) if ($requires{$dep}); print $spec (" >= " . $requires{$dep}) if ($requires{$dep});
print $spec "\n"; print $spec "\n";