From 436d2e6f7d58ce54af5155ceffcccd38218aba21172f33febde09b3b286c6c87 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.com>
Date: Fri, 9 Apr 2010 09:13:14 +0000
Subject: [PATCH] new version

OBS-URL: https://build.opensuse.org/package/show/Base:System/perl-Bootloader?expand=0&rev=17
---
 perl-Bootloader-0.5.10.tar.bz2 |  3 +++
 perl-Bootloader-0.5.9.tar.bz2  |  3 ---
 perl-Bootloader.changes        | 13 +++++++++++++
 perl-Bootloader.spec           |  6 +++---
 update-bootloader              |  6 +++---
 5 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 perl-Bootloader-0.5.10.tar.bz2
 delete mode 100644 perl-Bootloader-0.5.9.tar.bz2

diff --git a/perl-Bootloader-0.5.10.tar.bz2 b/perl-Bootloader-0.5.10.tar.bz2
new file mode 100644
index 0000000..c2b8a8d
--- /dev/null
+++ b/perl-Bootloader-0.5.10.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:abca5b38199130e24d98077c5668ca5069effcab61a1acdaec05d84697c45142
+size 52339
diff --git a/perl-Bootloader-0.5.9.tar.bz2 b/perl-Bootloader-0.5.9.tar.bz2
deleted file mode 100644
index 1b19bd1..0000000
--- a/perl-Bootloader-0.5.9.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a547cb8807a3ff3bcf728d906ed8c09dd4ba2dc92d6e95346e6f2331aad1c463
-size 52467
diff --git a/perl-Bootloader.changes b/perl-Bootloader.changes
index 9d7793a..2e7dd75 100644
--- a/perl-Bootloader.changes
+++ b/perl-Bootloader.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Apr  9 09:08:34 UTC 2010 - jreidinger@novell.com
+
+- use same root as it is in etc/fstab (bnc#575362)
+- use new zypper method to get boot label (prevent hang during
+  installation)
+- 0.5.10
+
+-------------------------------------------------------------------
+Wed Mar 31 08:21:21 UTC 2010 - jreidinger@novell.com
+
+- don't allow empty custom boot for GRUB (bnc#589433)
+
 -------------------------------------------------------------------
 Fri Feb 26 14:01:47 UTC 2010 - jreidinger@novell.com
 
diff --git a/perl-Bootloader.spec b/perl-Bootloader.spec
index 4439ce1..5f9a1ab 100644
--- a/perl-Bootloader.spec
+++ b/perl-Bootloader.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package perl-Bootloader (Version 0.5.9)
+# spec file for package perl-Bootloader (Version 0.5.10)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,8 +19,8 @@
 
 
 Name:           perl-Bootloader
-Version:        0.5.9
-Release:        1
+Version:        0.5.10
+Release:        0
 Requires:       perl-base = %{perl_version}
 Requires:       e2fsprogs
 Recommends:     perl-gettext
diff --git a/update-bootloader b/update-bootloader
index b7d8e3c..881950b 100644
--- a/update-bootloader
+++ b/update-bootloader
@@ -120,9 +120,9 @@ sub GetProduct {
      
     # first try: use zypper
     if ( -f '/usr/bin/zypper' ){
-      my $zypper_xml = qx{ZYPP_READONLY_HACK=1 zypper -qx --no-refresh pd -i | grep 'isbase="1"'};
-      if ($zypper_xml =~ m/^.*summary="([^"]*)".*shortname="([^"]*)".*$/){
-        return $1 if ($1 ne ""); #FIXME add here exceptions if bootloader has problems with long names
+      my $zypper_out = qx{zypper --terse tos -l};
+      if ($zypper_out =~ m/^labelLong\s*(\S.*\S)\s*\nlabelShort\s*(\S.*\S)[\s\n]*$/){
+        return $1 if ($1 ne "" && $loader eq "grub");
         return $2 if ($2 ne "");
       }
     }