cleanoldrpm: fix version to compare

2 files changed, 7 insertions, 3 deletions

diff --git a/buildfct b/buildfct
index f7bd6f2..8728fb5 100644
--- a/buildfct
+++ b/buildfct
@@ -410,7 +410,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 31 32 33
+  for i in 33 32 31
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
diff --git a/cleanoldrpm b/cleanoldrpm
index 17d659c..e8451b9 100755
--- a/cleanoldrpm
+++ b/cleanoldrpm
@@ -34,10 +34,14 @@ foreach (glob("*.rpm") as $name) {
 	if (isset($multi[$i])) {
 		$i .= "/" . substr($info['Version'], 0, $multi[$i]);
 	}
-	$rpms[$i][$info['Version']] = $name;
+	$ver = $info['Version'] . '-' . $info['Release'];
+	if (isset($info['Epoch'])) {
+		$ver = $info['Epoch'] . ':' . $ver;
+	}
+	$rpms[$i][$ver] = $name;
 }
 
-foreach($rpms as $rpm) {
+foreach($rpms as $n => $rpm) {
 	if (count($rpm) > $keep) {
 		uksort($rpm, "rpmvercmp");
 		$i = count($rpm) - $keep;