From 593f46434183910b78671332371bc707a67ccd6b Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Fri, 16 Dec 2011 12:11:25 +0000 Subject: [PATCH 1/2] - Fix ocfs2_controld build (/usr/include/pacemaker/crm/common/stack.h moved to /usr/include/pacemaker/crm/cluster/stack.h) OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=33 --- ocfs2-tools.changes | 6 ++++++ ocfs2-tools.spec | 29 +++++++++++++++-------------- ocfs2_controld-pacemaker.diff | 6 ++++-- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes index b3ffbd1..e7a11ca 100644 --- a/ocfs2-tools.changes +++ b/ocfs2-tools.changes @@ -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 diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index 69a1bf8..fb90734 100644 --- a/ocfs2-tools.spec +++ b/ocfs2-tools.spec @@ -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 diff --git a/ocfs2_controld-pacemaker.diff b/ocfs2_controld-pacemaker.diff index fc7d000..3752c80 100644 --- a/ocfs2_controld-pacemaker.diff +++ b/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 #include #include - #include +-#include ++#include +#include +#include From b422162fadf38025a6720edb22abc610248fb225 Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Wed, 21 Dec 2011 14:26:19 +0000 Subject: [PATCH 2/2] Accepting request 97653 from home:coolo:removeautoconf add autoconf to buildrequires OBS-URL: https://build.opensuse.org/request/show/97653 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=34 --- ocfs2-tools.changes | 10 ++++++++++ ocfs2-tools.spec | 27 ++------------------------- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes index e7a11ca..10d40e3 100644 --- a/ocfs2-tools.changes +++ b/ocfs2-tools.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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 diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index fb90734..f1d7b3c 100644 --- a/ocfs2-tools.spec +++ b/ocfs2-tools.spec @@ -15,7 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ocfs2-tools +BuildRequires: autoconf BuildRequires: e2fsprogs-devel BuildRequires: glib2-devel BuildRequires: libcorosync-devel @@ -63,12 +65,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 - %package -n ocfs2console Summary: Oracle Cluster Filesystem 2 GUI tools Obsoletes: ocfs2-support @@ -81,12 +77,6 @@ OCFS is the Oracle Cluster Filesystem. This package contains additional tools and a GUI (python-gtk). - - -Authors: --------- - Oracle Corporation - %package devel Summary: Oracle Cluster File System 2 Development files Requires: ocfs2-tools = %{version}, libcom_err, libcom_err-devel @@ -97,12 +87,6 @@ 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 Summary: Oracle Cluster File System 2 Core Tools Requires: ocfs2-tools = %{version} @@ -113,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 @@ -134,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