Accepting request 98030 from network:ha-clustering:Factory

Fix build against latest version of Pacemaker, couple of other minor spec tweaks

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

ocfs2-tools.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Dec 21 14:13:46 UTC 2011 - coolo@suse.com
+
+- add autoconf as buildrequire to avoid implicit dependency
+
+-------------------------------------------------------------------
+Wed Dec 21 10:31:42 UTC 2011 - coolo@suse.com
+
+- remove call to suse_update_config (very old work around)
+
+-------------------------------------------------------------------
+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
 

ocfs2-tools.spec

@@ -15,16 +15,26 @@
 # 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:  autoconf
+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:        1
 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 +52,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  
@@ -56,16 +65,8 @@ OCFS is the Oracle Cluster File System.
 This package contains the core user-space tools needed for creating and
 managing the file system.
 
-
-
-Authors:
---------
-    Oracle Corporation
-
 %package -n ocfs2console
-License:        GPL-2.0+
 Summary:        Oracle Cluster Filesystem 2 GUI tools
-Group:          System/Filesystems
 Obsoletes:      ocfs2-support
 Requires:       ocfs2-tools = %{version}
 AutoReqProv:    No
@@ -76,16 +77,8 @@ OCFS is the Oracle Cluster Filesystem.
 
 This package contains additional tools and a GUI (python-gtk).
 
-
-
-Authors:
---------
-    Oracle Corporation
-
 %package devel
-License:        GPL-2.0+
 Summary:        Oracle Cluster File System 2 Development files
-Group:          System/Filesystems
 Requires:       ocfs2-tools = %{version}, libcom_err, libcom_err-devel
 
 %description devel
@@ -94,16 +87,8 @@ OCFS is the Oracle Cluster File System.
 This package contains the header files and static libraries for
 developing low-level OCFS2-aware applications.
 
-
-
-Authors:
---------
-    Oracle Corporation
-
 %package o2cb
-License:        GPL-2.0+
 Summary:        Oracle Cluster File System 2 Core Tools
-Group:          System/Filesystems
 Requires:       ocfs2-tools = %{version}
 
 %description o2cb
@@ -112,12 +97,6 @@ OCFS is the Oracle Cluster File System.
 This package contains the core user-space tools needed for creating and
 managing the file system.
 
-
-
-Authors:
---------
-    Oracle Corporation
-
 %prep
 %setup -q -n %{name} -a 2
 %patch101 -p1
@@ -133,7 +112,6 @@ Authors:
 %patch204 -p1
 
 %build
-%{?suse_update_config:%{suse_update_config -f}}
 export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
 export PROJECT="ocfs2-tools"
 autoreconf -fi -I /usr/share/aclocal

ocfs2_controld-pacemaker.diff

@@ -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>