From 36789395988f79b766b6f0d1678f53ffb84b240b Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Thu, 7 Feb 2008 13:02:31 +0000
Subject: do not try to install openoffice64 on x86_64 (#37318)

---
 perl-install/NEWS                  | 3 +++
 perl-install/standalone/harddrake2 | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index df8176c08..ae57b9be0 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- harddrake:
+  o do not try to install openoffice64 on x86_64 (#37318)
+
 Version 10.6.14 - 5 February 2008
 
 - bootloader-config:
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 6bd946102..6b733e158 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -582,5 +582,5 @@ sub popup_menu {
 sub simple_read_rpmsrate() {
     require pkgs;
     my ($rates, $flags) = pkgs::read_rpmsrate({}, { }, '/usr/share/meta-task/rpmsrate-raw', 0);
-    grep { member('TRUE', @{$flags->{$_}}) && $rates->{$_} >= 5 } keys %$flags;
+    grep { !/openoffice/ && member('TRUE', @{$flags->{$_}}) && $rates->{$_} >= 5 } keys %$flags;
 }
-- 
cgit v1.2.1