From 17bcd710f75cc29336227d3d83ad32243fb34cb9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 12 Mar 2008 11:05:39 -0400 Subject: [PATCH] * Extract prefixes field before extracting scripts so that RPM_INSTALL_PREFIX gets set. --- Alien/Package/Rpm.pm | 23 ++++++++++++----------- debian/changelog | 7 +++++++ 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Alien/Package/Rpm.pm b/Alien/Package/Rpm.pm index 4c67ed1..ac9dbdd 100644 --- a/Alien/Package/Rpm.pm +++ b/Alien/Package/Rpm.pm @@ -78,18 +78,19 @@ sub scan { POSTUN => 'postrm', ); - # These fields need no translation except case. - foreach (qw{name version release arch changelogtext summary - description copyright prefixes}) { - $fieldtrans{uc $_}=$_; - } - # Use --queryformat to pull out all the fields we need. - foreach my $field (keys(%fieldtrans)) { - $_=$this->runpipe(0, "LANG=C rpm -qp --queryformat \%{$field} $file"); - $field=$fieldtrans{$field}; - $_='' if $_ eq '(none)'; - $this->$field($_); + foreach my $field (qw{NAME VERSION RELEASE ARCH CHANGELOGTEXT + SUMMARY DESCRIPTION COPYRIGHT PREFIXES}, + keys(%fieldtrans)) { + my $value=$this->runpipe(0, "LANG=C rpm -qp --queryformat \%{$field} $file"); + if (exists $fieldtrans{$field}) { + $field=$fieldtrans{$field}; + } + else { + $field=lc($field); + } + $value='' if $value eq '(none)'; + $this->$field($value); } # Get the conffiles list. diff --git a/debian/changelog b/debian/changelog index 934637f..709cae8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +alien (8.70) UNRELEASED; urgency=low + + * Extract prefixes field before extracting scripts so that + RPM_INSTALL_PREFIX gets set. + + -- Joey Hess Wed, 12 Mar 2008 11:04:06 -0400 + alien (8.69) unstable; urgency=low * Alien's repository has moved from subversion to git.