ailiopoulos/ocfs2-tools
1
0
Fork 0
forked from pool/ocfs2-tools
Code Pull Requests Activity

- Fix ocfs2_controld build (/usr/include/pacemaker/crm/common/stack.h moved to /usr/include/pacemaker/crm/cluster/stack.h)

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=33
This commit is contained in:
Tim Serong 2011-12-16 12:11:25 +00:00 committed by Git OBS Bridge
parent c57983ca56
commit 593f464341
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ocfs2-tools.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Dec 16 12:06:36 UTC 2011 - tserong@suse.com
- Fix ocfs2_controld build (/usr/include/pacemaker/crm/common/stack.h
moved to /usr/include/pacemaker/crm/cluster/stack.h)
-------------------------------------------------------------------
Tue Aug 30 09:38:52 UTC 2011 - tserong@suse.com

29
ocfs2-tools.spec
View File

@ -15,16 +15,24 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: ocfs2-tools
BuildRequires: e2fsprogs-devel glib2-devel libcorosync-devel libdlm-devel libopenais-devel libpacemaker-devel libxml2-devel libxslt-devel python-devel python-gtk-devel readline-devel update-desktop-files
BuildRequires: e2fsprogs-devel
BuildRequires: glib2-devel
BuildRequires: libcorosync-devel
BuildRequires: libdlm-devel
BuildRequires: libopenais-devel
BuildRequires: libpacemaker-devel
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: python-devel
BuildRequires: python-gtk-devel
BuildRequires: readline-devel
BuildRequires: update-desktop-files
Summary: Oracle Cluster File System 2 Core Tools
Version: 1.8.0
Release: 2
License: GPLv2+
License: GPL-2.0+
Group: System/Filesystems
Version: 1.8.0
Release: 0
Source: ocfs2-tools.tar.bz2
Source1: o2cb.ocf
Source2: reflink.tar.bz2
@ -42,7 +50,6 @@ Patch204: dont-use-var-lock-subsys.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
AutoReqProv: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libdlm openais
%if %suse_version < 1120
@ -63,9 +70,7 @@ Authors:
Oracle Corporation
%package -n ocfs2console
License: GPLv2+
Summary: Oracle Cluster Filesystem 2 GUI tools
Group: System/Filesystems
Obsoletes: ocfs2-support
Requires: ocfs2-tools = %{version}
AutoReqProv: No
@ -83,9 +88,7 @@ Authors:
Oracle Corporation
%package devel
License: GPLv2+
Summary: Oracle Cluster File System 2 Development files
Group: System/Filesystems
Requires: ocfs2-tools = %{version}, libcom_err, libcom_err-devel
%description devel
@ -101,9 +104,7 @@ Authors:
Oracle Corporation
%package o2cb
License: GPLv2+
Summary: Oracle Cluster File System 2 Core Tools
Group: System/Filesystems
Requires: ocfs2-tools = %{version}
%description o2cb

6
ocfs2_controld-pacemaker.diff
View File

@ -2,10 +2,12 @@ Index: ocfs2-tools/ocfs2_controld/pacemaker.c
===================================================================
--- ocfs2-tools.orig/ocfs2_controld/pacemaker.c
+++ ocfs2-tools/ocfs2_controld/pacemaker.c
@@ -31,6 +31,8 @@
@@ -30,7 +30,9 @@
#include <pacemaker/crm/crm.h>
#include <pacemaker/crm/ais.h>
#include <pacemaker/crm/common/cluster.h>
#include <pacemaker/crm/common/stack.h>
-#include <pacemaker/crm/common/stack.h>
+#include <pacemaker/crm/cluster/stack.h>
+#include <pacemaker/crm/common/ipc.h>
+#include <pacemaker/crm/msg_xml.h>