From 6a3feaa3dc3d0c2b091974dc89cfcbb3a06f99cc Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 2 Feb 2012 09:53:45 +0000
Subject: [PATCH] rpmclosure, also take into account rel attribute when
versions are the same
svn path=/nixpkgs/trunk/; revision=31964
---
pkgs/build-support/vm/rpm/rpm-closure.pl | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/pkgs/build-support/vm/rpm/rpm-closure.pl
index 2ef59dcbdef3..3771ef6eea55 100644
--- a/pkgs/build-support/vm/rpm/rpm-closure.pl
+++ b/pkgs/build-support/vm/rpm/rpm-closure.pl
@@ -76,8 +76,9 @@ for (my $i = 0; $i < scalar(@packagesFiles); $i++) {
my $earlierPkg = $pkgs{$pkg->{name}};
print STDERR "WARNING: duplicate occurrence of package $pkg->{name}\n";
# <version epoch="0" ver="1.28.0" rel="2.el6"/>
- if (rpmvercmp($pkg->{'version'}->{ver}, $earlierPkg->{'version'}->{ver}) >= 0) {
- print STDERR "WARNING: replaced package $pkg->{name} with newer one\n";
+ my $cmp = rpmvercmp($pkg->{'version'}->{ver}, $earlierPkg->{'version'}->{ver});
+ if ($cmp > 0 || ($cmp == 0 && rpmvercmp($pkg->{'version'}->{rel}, $earlierPkg->{'version'}->{rel})>0)) {
+ print STDERR "WARNING: replaced package $pkg->{name} (".$earlierPkg->{'version'}->{ver}." ".$earlierPkg->{'version'}->{rel}.") with newer one (".$pkg->{'version'}->{ver}." ".$pkg->{'version'}->{rel}.")\n";
$pkg->{urlPrefix} = $urlPrefixes[$i];
$pkgs{$pkg->{name}} = $pkg;
}
@@ -175,3 +176,4 @@ foreach my $pkgName (@needed) {
}
print "]\n";
+exit 1