OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocfs2-tools?expand=0&rev=14

ocfs2-tools.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Jan 13 17:12:27 CET 2009 - coyli@suse.de
+
+- fix ocfs2console crashing when DISOPLAY is not correclty set(bnc#448523),
+  thanks to Hu Ziming from IBM.
+
+-------------------------------------------------------------------
+Sat Jan  3 18:41:34 CET 2009 - coly.li@suse.de
+
+- add ocfs2-kmp (ocfs2 KMP package) into installation dependency(bnc#459437)
+
 -------------------------------------------------------------------
 Fri Dec  5 01:00:12 CST 2008 - coyli@suse.de
 

ocfs2-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ocfs2-tools (Version 1.4.1)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 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
@@ -22,12 +22,13 @@ Name:           ocfs2-tools
 BuildRequires:  e2fsprogs-devel glib2-devel libdlm-devel libopenais-devel libpacemaker-devel libxml2-devel libxslt-devel python-devel python-gtk-devel readline-devel update-desktop-files
 Summary:        Oracle Cluster File System 2 Core Tools
 Version:        1.4.1
-Release:        7
+Release:        9
 License:        GPL v2 or later
 Group:          System/Filesystems
 Source:         ocfs2-tools.tar.bz2
 Source1:        o2cb.ocf
 Patch5:         ocfs2-tools-static-glib.diff
+Patch6:         ocfs2console-display-fix.diff
 Patch99:        ocfs2-devel.diff
 Patch100:       ocfs2-quota.diff
 Patch101:       change-quotafile-names.diff
@@ -36,7 +37,7 @@ Requires:       net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3
 PreReq:         %insserv_prereq %fillup_prereq
 AutoReqProv:    on
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       libdlm
+Requires:       libdlm ocfs2-kmp
 
 %description
 OCFS is the Oracle Cluster File System.
@@ -91,6 +92,7 @@ Authors:
 %prep
 %setup -n %{name}
 %patch5 -p1
+%patch6 -p1
 %patch99 -p1
 %patch100 -p1
 %patch101 -p1
@@ -200,10 +202,15 @@ fi
 %{_libdir}/pkgconfig/ocfs2.pc
 
 %changelog
+* Tue Jan 13 2009 coyli@suse.de
+- fix ocfs2console crashing when DISOPLAY is not correclty set(bnc#448523),
+  thanks to Hu Ziming from IBM.
+* Sat Jan 03 2009 coly.li@suse.de
+- add ocfs2-kmp (ocfs2 KMP package) into installation dependency(bnc#459437)
 * Fri Dec 05 2008 coyli@suse.de
 - ensure o2cb OCF resource agent is executable
 - add libdlm to ocfs2-tools' dependency (bnc#448751)
-* Fri Nov 21 2008 mfasheh@suse.com
+* Sat Nov 22 2008 mfasheh@suse.com
 - Add a quota fixup patch to match up system file names in tools
   with the kernel.
 * Wed Nov 12 2008 abeekhof@suse.de
@@ -273,9 +280,9 @@ fi
 - Create /sbin/rcocfs2, rco2cb symlinks (#167261).
 * Tue Apr 04 2006 lmb@suse.de
 - Install "ocfs2" init script and enable it (#160724).
-* Thu Mar 02 2006 jeffm@suse.com
+* Fri Mar 03 2006 jeffm@suse.com
 - Updated to version 1.2.0, per Oracle
-* Thu Mar 02 2006 jeffm@suse.com
+* Fri Mar 03 2006 jeffm@suse.com
 - Enabled o2cb by default on package install to allow it to shut
   down when manually started. Otherwise, the system will hang
   during shutdown.

ocfs2console-display-fix.diff

@@ -0,0 +1,28 @@
+From: Coly Li <coly.li@suse.de>
+Subject: fix ocfs2console crashing when DISPLAY is not correctly set
+References: bnc#448523
+Author: Hu Ziming <huzim@cn.ibm.com>
+
+When DISPLAY is not correctly set, this patch makes ocfs2console report error
+mesage and exit, other than a ugly crash.
+
+Signed-off-by: Hu Ziming <huzim@cn.ibm.com>
+Signed-off-by: Coly Li <coly.li@suse.de>
+---
+ ocfs2console/ocfs2console |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/ocfs2console/ocfs2console b/ocfs2console/ocfs2console
+index 77ab623..580d54b 100755
+--- a/ocfs2console/ocfs2console
++++ b/ocfs2console/ocfs2console
+@@ -3,6 +3,9 @@
+ from ocfs2interface.about import process_args
+ nodeconf = process_args()
+
++import warnings
++warnings.simplefilter("error")
++
+ try:
+     import gtk
+ except RuntimeError: