From 6edbac559ab83e220650fa9b5b1cc61f14ad7800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20=C3=98yvind=20Karlsen?= <peroyvind@mandriva.org>
Date: Wed, 19 Mar 2008 03:12:37 +0000
Subject: improve rpm version detection really fix callback size for rpm5.org
 versions

---
 Makefile.PL | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

(limited to 'Makefile.PL')

diff --git a/Makefile.PL b/Makefile.PL
index f760e93..de082ad 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -16,13 +16,18 @@ unless (defined $rpm_path) {
 
 defined $rpm_path or die "Can't find rpm on this system\n";
 
+sub hexversion {
+	my ($major, $minor, $micro) = (@_[0] =~ /(\d+)\.(\d+)\.?(\d+)?/);
+	return int($major<<16) + int($minor<<8) + int($micro<<0)
+}
+
 my $version = `LC_ALL=C $rpm_path --version`;
 # fix compiling with RCs:
 $version =~ s/(-.*)|(\.DEVEL)//;
 chomp $version;
 $version =~ s/(RPM version )|(rpm \(RPM\) )//;
-my $pversion = eval "v$version";
-$pversion ge v4.2 or die "Unable to build URPM with too old (or undetected) rpm version $version\n";
+my $hversion = hexversion($version);
+$hversion ge hexversion(4.2) or die "Unable to build URPM with too old (or undetected) rpm version $version\n";
 
 # to generate the ChangeLog depending on the checkout layout
 my $commonusername = "../common/";
@@ -45,23 +50,13 @@ ChangeLog:
 }
 
 my @rpmflags;
-if ($pversion ge v4.4.90 && $pversion lt v4.5) {
+#print $hversion;
+if ($hversion ge hexversion(4.4.90) && $hversion lt hexversion(4.5)) {
     # rpm.org version
-    push @rpmflags, '-DRPM_ORG';
+    push @rpmflags, "-DRPM_ORG";
 } else {
     # rpm5.org version
-    if ($pversion ge v4.4.6) {
-	push @rpmflags, '-DRPM_446';
-    }
-    if ($pversion ge v4.4.8) {
-	push @rpmflags, '-DRPM_448';
-    }
-    if ($pversion ge v4.5) {
-	push @rpmflags, '-DRPM_450';
-    }
-    if ($pversion ge v5.0) {
-	push @rpmflags, '-DRPM_500';
-    }
+	push @rpmflags, "-DRPM_VERSION_CODE=$hversion";
 }
 my $ccflags = join(' ', '-Wall -fno-strict-aliasing', @rpmflags);
 
-- 
cgit v1.2.1