From 8a360d0261c4cdd5bc395e4420cd58f90bb9437ce0cbaa214408d1458563e137 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Thu, 22 Apr 2010 19:22:17 +0000
Subject: [PATCH] Accepting request 38510 from Base:System

checked in (request 38510)

OBS-URL: https://build.opensuse.org/request/show/38510
OBS-URL: https://build.opensuse.org/package/show/Base:System/perl-Bootloader?expand=0&rev=20
---
 perl-Bootloader-0.5.10.tar.bz2 |  3 +++
 perl-Bootloader-0.5.11.tar.bz2 |  3 ---
 perl-Bootloader.changes        |  9 ---------
 perl-Bootloader.spec           | 24 ++++++++++++++++--------
 update-bootloader              |  1 -
 5 files changed, 19 insertions(+), 21 deletions(-)
 create mode 100644 perl-Bootloader-0.5.10.tar.bz2
 delete mode 100644 perl-Bootloader-0.5.11.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.11.tar.bz2 b/perl-Bootloader-0.5.11.tar.bz2
deleted file mode 100644
index aa188cc..0000000
--- a/perl-Bootloader-0.5.11.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5d71aed808427849b5774f1f7dea98c39704a4b4e804be16fbf95818a8bf31c9
-size 52371
diff --git a/perl-Bootloader.changes b/perl-Bootloader.changes
index 59919bc..2e7dd75 100644
--- a/perl-Bootloader.changes
+++ b/perl-Bootloader.changes
@@ -1,12 +1,3 @@
--------------------------------------------------------------------
-Thu Apr 22 12:48:03 UTC 2010 - jreidinger@novell.com
-
-- adapt to new kernel which use only ext_range (bnc#597774)
-- explicitelly mention that output come from pbl (bnc#597810)
-- port changes from SP1 - avoid warning if path is not used 
-  and create failsafe also on s390
-- 0.5.11
-
 -------------------------------------------------------------------
 Fri Apr  9 09:08:34 UTC 2010 - jreidinger@novell.com
 
diff --git a/perl-Bootloader.spec b/perl-Bootloader.spec
index 20d3ad9..1ee33e6 100644
--- a/perl-Bootloader.spec
+++ b/perl-Bootloader.spec
@@ -1,22 +1,30 @@
 #
-# spec file for package perl-Bootloader (Version 0.5.11)
+# spec file for package perl-Bootloader (Version 0.5.10)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 
+
 Name:           perl-Bootloader
-Version:        0.5.11
-Release:        0
+Version:        0.5.10
+Release:        1
 Requires:       perl-base = %{perl_version}
 Requires:       e2fsprogs
 Recommends:     perl-gettext
-Autoreqprov:    on
+AutoReqProv:    on
 Group:          System/Boot
 License:        GNU General Public License (GPL)
 Summary:        Library for Configuring Boot Loaders
@@ -89,4 +97,4 @@ sed -i '/ZIPL/D;/PowerLILO/D;/\/LILO/D;/GRUB/D;' $RPM_BUILD_ROOT/%{perl_vendorar
 /usr/lib/bootloader
 /boot/boot.readme
 
-%changelog -n perl-Bootloader
+%changelog
diff --git a/update-bootloader b/update-bootloader
index 78b4bc0..881950b 100644
--- a/update-bootloader
+++ b/update-bootloader
@@ -445,7 +445,6 @@ if (defined $oper{add}) {
 	# smp, bigsmp or pae and not a xen kernel.
 	if ((($arch eq "i386") ||
 	    ($arch eq "x86_64") ||
-	    ($arch eq "s390x") ||
 	    ($arch eq "ia64")) &&
 	    (($opt_image =~ /-default/) ||
 	    ($opt_image =~ /-smp/) ||