From 60f8b7276142ba551e957a9de174580f757266c4 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 28 Aug 2008 00:18:14 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocfs2-tools?expand=0&rev=6 --- ocfs2-tools-suse.diff | 75 ++++++++++++++++++++++++++----------------- ocfs2-tools.changes | 5 +++ ocfs2-tools.spec | 27 +++++++++++----- 3 files changed, 70 insertions(+), 37 deletions(-) diff --git a/ocfs2-tools-suse.diff b/ocfs2-tools-suse.diff index 365cbd5..31b3e13 100644 --- a/ocfs2-tools-suse.diff +++ b/ocfs2-tools-suse.diff @@ -1,19 +1,41 @@ -Index: ocfs2-tools/vendor/common/o2cb.init -=================================================================== ---- ocfs2-tools.orig/vendor/common/o2cb.init -+++ ocfs2-tools/vendor/common/o2cb.init -@@ -6,8 +6,8 @@ +--- + debugfs.ocfs2/Makefile | 5 ++-- + vendor/common/o2cb.init | 53 ++++++++++++++++++++++++++++++++++++++++++++--- + vendor/common/ocfs2.init | 4 --- + 3 files changed, 54 insertions(+), 8 deletions(-) + +--- a/debugfs.ocfs2/Makefile ++++ b/debugfs.ocfs2/Makefile +@@ -12,10 +12,11 @@ INCLUDES = -Iinclude -I$(TOPDIR)/libocfs + INCLUDES += $(GLIB_CFLAGS) + + ifdef OCFS2_DEBUG +-CFLAGS = -Wall -O -ggdb ++OPTS = -O -ggdb + else +-CFLAGS = -Wall -O2 ++OPTS = -O2 + endif ++CFLAGS=-Wall $(OPTS) + + CFILES = main.c commands.c dump.c utils.c journal.c find_block_inode.c find_inode_paths.c dump_fs_locks.c + +--- a/vendor/common/o2cb.init ++++ b/vendor/common/o2cb.init +@@ -6,9 +6,9 @@ # ### BEGIN INIT INFO # Provides: o2cb -# Required-Start: $network -# Should-Start: +-# Required-Stop: +# Required-Start: $network $syslog $named +# Should-Start: sshd iscsi - # Required-Stop: ++# Required-Stop: $null # Default-Start: 2 3 5 # Default-Stop: -@@ -130,6 +130,10 @@ O2CB_BOOTCLUSTER=${O2CB_BOOTCLUSTER} + # Description: Load O2CB cluster services at system boot. +@@ -151,6 +151,10 @@ O2CB_KEEPALIVE_DELAY_MS=${O2CB_KEEPALIVE # O2CB_RECONNECT_DELAY_MS: Min time in ms between connection attempts O2CB_RECONNECT_DELAY_MS=${O2CB_RECONNECT_DELAY_MS} @@ -24,7 +46,7 @@ Index: ocfs2-tools/vendor/common/o2cb.init EOF if [ $? != 0 ] -@@ -208,6 +212,34 @@ EOF +@@ -354,6 +358,34 @@ EOF read_timeout "network reconnect delay in ms" "$O2CB_RECONNECT_DELAY_MS" "$MIN_RECONNECT_DELAY_MS" "$DEF_RECONNECT_DELAY_MS" O2CB_RECONNECT_DELAY_MS="$RET_VAL" @@ -59,7 +81,7 @@ Index: ocfs2-tools/vendor/common/o2cb.init # XXX ask about mount point base } -@@ -526,6 +558,21 @@ load() +@@ -707,6 +739,21 @@ load() eval ${LOAD_ACTIONS[i]} if_fail "$?" done @@ -72,30 +94,25 @@ Index: ocfs2-tools/vendor/common/o2cb.init + else + echo "FAILED" + fi -+ ++ + else + echo "FAILED" + fi + fi -+ ++ } load_status() -Index: ocfs2-tools/debugfs.ocfs2/Makefile -=================================================================== ---- ocfs2-tools.orig/debugfs.ocfs2/Makefile -+++ ocfs2-tools/debugfs.ocfs2/Makefile -@@ -12,10 +12,11 @@ INCLUDES = -Iinclude -I$(TOPDIR)/libocfs - INCLUDES += $(GLIB_CFLAGS) - - ifdef OCFS2_DEBUG --CFLAGS = -Wall -O -ggdb -+OPTS = -O -ggdb - else --CFLAGS = -Wall -O2 -+OPTS = -O2 - endif -+CFLAGS=-Wall $(OPTS) - - CFILES = main.c commands.c dump.c utils.c journal.c find_block_inode.c find_inode_paths.c dump_fs_locks.c - +--- a/vendor/common/ocfs2.init ++++ b/vendor/common/ocfs2.init +@@ -8,9 +8,7 @@ + ### BEGIN INIT INFO + # Provides: ocfs2 + # Required-Start: $network o2cb +-# Required-Stop: +-# X-UnitedLinux-Should-Start: +-# X-UnitedLinux-Should-Stop: ++# Required-Stop: $null + # Default-Start: 2 3 5 + # Default-Stop: + # Description: Mount OCFS2 volumes at boot. diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes index 132ee5c..a10d93a 100644 --- a/ocfs2-tools.changes +++ b/ocfs2-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 26 20:54:05 CEST 2008 - jeffm@suse.com + +- Made init scripts LSB compliant. + ------------------------------------------------------------------- Fri Feb 22 17:05:56 CET 2008 - jeffm@suse.com diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index b1ac87d..93569c2 100644 --- a/ocfs2-tools.spec +++ b/ocfs2-tools.spec @@ -2,9 +2,16 @@ # spec file for package ocfs2-tools (Version 1.3.9) # # Copyright (c) 2008 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. # +# 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/ # @@ -15,7 +22,7 @@ Name: ocfs2-tools BuildRequires: e2fsprogs-devel glib2-devel python-devel python-gtk-devel readline-devel update-desktop-files Summary: Oracle Cluster File System 2 Core Tools Version: 1.3.9 -Release: 4 +Release: 58 License: GPL v2 or later Group: System/Filesystems Source: ocfs2-tools-%{version}.tar.bz2 @@ -44,6 +51,7 @@ Authors: Oracle Corporation %package -n ocfs2console +License: GPL v2 or later Summary: Oracle Cluster Filesystem 2 GUI tools Group: System/Filesystems Obsoletes: ocfs2-support @@ -64,6 +72,7 @@ Authors: Oracle Corporation %package devel +License: GPL v2 or later Summary: Oracle Cluster File System 2 Development files Group: System/Filesystems Requires: ocfs2-tools = %{version}, libcom_err, libcom_err-devel @@ -182,13 +191,15 @@ fi %{_libdir}/pkgconfig/ocfs2.pc %changelog +* Tue Aug 26 2008 jeffm@suse.com +- Made init scripts LSB compliant. * Fri Feb 22 2008 jeffm@suse.com - Re-added init script support for userspace heartbeat. * Tue Feb 19 2008 jeffm@suse.com - Statically link glib-2.0 with tunefs and o2cb_ctl. * Mon Jan 28 2008 jeffm@suse.com - Update to 1.3.9 -* Mon Jan 14 2008 jeffm@suse.com +* Tue Jan 15 2008 jeffm@suse.com - Update to 1.2.7 - Add shrinking journal size support - Fix crash in slotmap @@ -202,14 +213,14 @@ fi - Multiple fsck fixes - Offline resize - Documentation updates -* Sun Nov 19 2006 schwab@suse.de +* Mon Nov 20 2006 schwab@suse.de - Don't use kernel headers. -* Sun Nov 19 2006 ro@suse.de +* Mon Nov 20 2006 ro@suse.de - define offsetof locally if it does not come from kernel header * Mon Oct 30 2006 lmb@suse.de - Upgrade to version 1.2.2 to match in-kernel version. - Split-off devel subpackage. -* Sat Oct 28 2006 meissner@suse.de +* Sun Oct 29 2006 meissner@suse.de - use RPM_OPT_FLAGS * Sat Sep 30 2006 aj@suse.de - Cleanup BuildRequires. @@ -233,7 +244,7 @@ fi - converted neededforbuild to BuildRequires * Fri Nov 11 2005 lmb@suse.de - Should-Start: iscsi added (from SLES9) (#114733) -* Wed Nov 02 2005 dmueller@suse.de +* Thu Nov 03 2005 dmueller@suse.de - don't build as root * Wed Nov 02 2005 jeffm@suse.com - Update to version 1.1.3 - SVN 1105