[system-config-kdump] Fix a bug in creating dialogs

[Roman Rakus]

commit ce96cfae0823e766ddff6c0881d9a18fd6004fe8
Author: Roman Rakus <rrakus at redhat.com>
Date:   Thu Sep 15 11:36:48 2011 +0200

    Fix a bug in creating dialogs
    
    Signed-off-by: Roman Rakus <rrakus at redhat.com>

 system-config-kdump-2.0.5-dialogs.patch  |   29 +++++++++++++++++++++++++++++
 system-config-kdump-2.0.5-dialogs2.patch |   21 +++++++++++++++++++++
 system-config-kdump.spec                 |   11 ++++++++++-
 3 files changed, 60 insertions(+), 1 deletions(-)
---
diff --git a/system-config-kdump-2.0.5-dialogs.patch b/system-config-kdump-2.0.5-dialogs.patch
new file mode 100644
index 0000000..8147f84
--- /dev/null
+++ b/system-config-kdump-2.0.5-dialogs.patch
@@ -0,0 +1,29 @@
+commit e736248df26c7244e60f0a2017c082c307748f0f
+Author: Roman Rakus <rrakus at redhat.com>
+Date:   Wed Sep 7 15:56:24 2011 +0200
+
+    Some cleanup
+    
+    Signed-off-by: Roman Rakus <rrakus at redhat.com>
+
+diff --git a/src/system-config-kdump.py b/src/system-config-kdump.py
+index 321eda0..5a36ad8 100755
+--- a/src/system-config-kdump.py
++++ b/src/system-config-kdump.py
+@@ -519,7 +519,7 @@ class MainWindow:
+ 
+         # maybe we're running from live media with syslinux?
+         if self.default_kernel == '':
+-            self.show_error_message(_("Don't know how to configure your boot loader."),
++            dialogs.show_error_message(_("Don't know how to configure your boot loader."),
+                                     _("system-config-kdump: no default kernel"))
+             sys.exit(1)
+ 
+@@ -565,7 +565,6 @@ class MainWindow:
+         kdump_mem = 0
+         kdump_mem_grubby = 0
+         kdump_offset = 0
+-        kdump_offset_grubby = 0
+         # PowerPC64 doesn't list crashkernel reservation in /proc/iomem
+         if self.arch != 'ppc64':
+             io_mem = open("/proc/iomem").readlines()
diff --git a/system-config-kdump-2.0.5-dialogs2.patch b/system-config-kdump-2.0.5-dialogs2.patch
new file mode 100644
index 0000000..168e7ac
--- /dev/null
+++ b/system-config-kdump-2.0.5-dialogs2.patch
@@ -0,0 +1,21 @@
+commit 2af7080dbc3149acba013f47deca6608b0219aac
+Author: Roman Rakus <rrakus at redhat.com>
+Date:   Wed Sep 14 15:58:28 2011 +0200
+
+    More cleanup
+    
+    Signed-off-by: Roman Rakus <rrakus at redhat.com>
+
+diff --git a/src/system-config-kdump.py b/src/system-config-kdump.py
+index fe82dac..a9be0c2 100755
+--- a/src/system-config-kdump.py
++++ b/src/system-config-kdump.py
+@@ -1437,7 +1437,7 @@ class MainWindow:
+                 self.kdump_mem_spin_button.set_value(float(size))
+                 self.update_usable_mem(self.kdump_mem_spin_button)
+             except ValueError, reason:
+-                self.show_error_message(_("Invalid crashkernel value: %s."
++                dialogs.show_error_message(_("Invalid crashkernel value: %s."
+                     "\nPossible values are:\n\tX\n\tX at Y\n\n%s")
+                     %(value,reason),
+                     _("Bad crashkernel value"))
diff --git a/system-config-kdump.spec b/system-config-kdump.spec
index 239d069..96f94ac 100644
--- a/system-config-kdump.spec
+++ b/system-config-kdump.spec
@@ -3,7 +3,7 @@
 Summary: A graphical interface for configuring kernel crash dumping
 Name: system-config-kdump
 Version: 2.0.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://fedorahosted.org/system-config-kdump/
 License: GPLv2+
 Group: System Environment/Base
@@ -29,6 +29,10 @@ Source1: %{name}.png
 # Fix some typos #649385
 Patch2: system-config-kdump-2.0.5-typos.patch
 
+# Fix a bug during creating dialogs
+Patch3: system-config-kdump-2.0.5-dialogs.patch
+Patch4: system-config-kdump-2.0.5-dialogs2.patch
+
 %description
 system-config-kdump is a graphical tool for configuring kernel crash
 dumping via kdump and kexec.
@@ -37,6 +41,8 @@ dumping via kdump and kexec.
 %setup -q
 %patch1 -p1 -b .new_icon
 %patch2 -p1 -b .typos
+%patch3 -p1 -b .dialogs
+%patch4 -p1 -b .dialogs2
 
 %build
 make
@@ -96,6 +102,9 @@ fi
 %doc %{_datadir}/omf/system-config-kdump
 
 %changelog
+* Thu Sep 15 2011 Roman Rakus <rrakus at redhat.com> - 2.0.5-5
+- Fix a bug in creating dialog
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild