From ea55014024bbd0ce59bc2889bb08fe95b7ff0959 Mon Sep 17 00:00:00 2001 From: joey Date: Fri, 4 Jan 2002 21:12:41 +0000 Subject: [PATCH] * Use --target noarch instead of --target=noarch when building rpms. The latter used to work, but no longer does, due to some change in rpm or popt. It also has to come after the -bb. * Trap stderr of rpm and debian/rules building packages, and only display if the build fails. --- Alien/Package/Deb.pm | 2 +- Alien/Package/Rpm.pm | 8 ++++---- TODO | 1 - debian/changelog | 10 ++++++++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Alien/Package/Deb.pm b/Alien/Package/Deb.pm index 927eb12..41d0295 100644 --- a/Alien/Package/Deb.pm +++ b/Alien/Package/Deb.pm @@ -422,7 +422,7 @@ sub build { my $this=shift; chdir $this->unpacked_tree; - my $log=`debian/rules binary`; + my $log=`debian/rules binary 2>&1`; if ($?) { die "Package build failed. Here's the log:\n", $log; } diff --git a/Alien/Package/Rpm.pm b/Alien/Package/Rpm.pm index 975398c..121db1f 100644 --- a/Alien/Package/Rpm.pm +++ b/Alien/Package/Rpm.pm @@ -348,14 +348,14 @@ sub build { # This is the new command line arcgument to make noarch # rpms. It appeared in rpm version 3. - $opts="--target=noarch" if $rpmarch eq 'noarch'; + $opts="--target noarch" if $rpmarch eq 'noarch'; } $opts.=" $ENV{RPMBUILDOPTS}" if exists $ENV{RPMBUILDOPTS}; - my $command="cd $dir; rpm $opts -bb ".$this->name."-".$this->version."-".$this->release.".spec >/dev/null"; - my $log=`$command`; + my $command="cd $dir; rpm -bb $opts ".$this->name."-".$this->version."-".$this->release.".spec"; + my $log=`$command 2>&1`; if ($?) { - die "Package build failed. Here's the log:\n", $log; + die "Package build failed. Here's the log of the command ($command):\n", $log; } return $rpm; diff --git a/TODO b/TODO index aff5a17..9418418 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,4 @@ * handling postinst script when converting to/from .slp packages. -* solaris pkgadd package support. Useful on sparc linux * alien needs to handle relocatable conffiles, partially relocatable packages, and packages that have maultiple parts that relocate differently. diff --git a/debian/changelog b/debian/changelog index 5f3953a..5ffaddf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +alien (7.31) unstable; urgency=low + + * Use --target noarch instead of --target=noarch when building rpms. + The latter used to work, but no longer does, due to some change in rpm or + popt. It also has to come after the -bb. + * Trap stderr of rpm and debian/rules building packages, and only display if + the build fails. + + -- Joey Hess Fri, 4 Jan 2002 13:53:04 -0500 + alien (7.30) unstable; urgency=low * Thanks to the excellent work of Mark A. Hershberger ,