From a67a179397389baf0eb477b52db732e00fd29323 Mon Sep 17 00:00:00 2001 From: Coly Li Date: Thu, 2 Dec 2010 08:27:43 +0000 Subject: [PATCH] - add '-q' in %setup of ocfs2-tools.spec, to make build log shorter. (patch written by aj@suse.de) OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=23 --- fix-crm_log_init.patch | 13 ------------- ocfs2-tools.changes | 7 +++---- ocfs2-tools.spec | 2 -- 3 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 fix-crm_log_init.patch diff --git a/fix-crm_log_init.patch b/fix-crm_log_init.patch deleted file mode 100644 index 1a0cf0a..0000000 --- a/fix-crm_log_init.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: ocfs2-tools/ocfs2_controld/pacemaker.c -=================================================================== ---- ocfs2-tools.orig/ocfs2_controld/pacemaker.c -+++ ocfs2-tools/ocfs2_controld/pacemaker.c -@@ -154,7 +154,7 @@ static void process_pcmk(int ci) - - int setup_stack(void) - { -- crm_log_init("ocfs2_controld", LOG_INFO, FALSE, TRUE, 0, NULL); -+ crm_log_init("ocfs2_controld", LOG_INFO, FALSE, TRUE, 0, NULL, TRUE); - - if(init_ais_connection(NULL, NULL, NULL, &local_node_uname, &our_nodeid) == FALSE) { - log_error("Connection to our AIS plugin (CRM) failed"); diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes index f32b821..49aee73 100644 --- a/ocfs2-tools.changes +++ b/ocfs2-tools.changes @@ -1,9 +1,8 @@ ------------------------------------------------------------------- -Sat Nov 20 04:34:04 UTC 2010 - aj@suse.de +Thu Dec 2 08:09:49 UTC 2010 - i@coly.li -- Fix crm_log_init invocation. -- remove patches that should have been removed according to - previous commits. +- add '-q' in %setup of ocfs2-tools.spec, to make build log shorter. + (patch written by aj@suse.de) ------------------------------------------------------------------- Wed Oct 20 17:33:02 UTC 2010 - i@coly.li diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index 22bb79a..7cbcb94 100644 --- a/ocfs2-tools.spec +++ b/ocfs2-tools.spec @@ -37,7 +37,6 @@ Patch106: ocfs2-devel.diff Patch107: reflink-no-syscall.patch Patch201: bug-543119-o2dlm.patch Patch202: fix-configure-check-libs.patch -Patch203: fix-crm_log_init.patch Url: http://oss.oracle.com/projects/ocfs2-tools/ Requires: net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3 PreReq: %insserv_prereq %fillup_prereq @@ -124,7 +123,6 @@ Authors: %patch107 -p0 %patch201 -p1 %patch202 -p1 -%patch203 -p1 %build %{?suse_update_config:%{suse_update_config -f}}