diff --git a/fix-ocfs2_controld-crmcommon-link.patch b/fix-ocfs2_controld-crmcommon-link.patch new file mode 100644 index 0000000..2a2eb76 --- /dev/null +++ b/fix-ocfs2_controld-crmcommon-link.patch @@ -0,0 +1,13 @@ +Index: ocfs2-tools/ocfs2_controld/Makefile +=================================================================== +--- ocfs2-tools.orig/ocfs2_controld/Makefile ++++ ocfs2-tools/ocfs2_controld/Makefile +@@ -67,7 +67,7 @@ DIST_FILES = \ + ocfs2_controld.pcmk: $(PCMK_DAEMON_OBJS) $(LIBO2CB_DEPS) + $(LINK) $(GLIB_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) \ + $(OPENAIS_LIBS) $(COROSYNC_LIBS) \ +- $(DLMCONTROL_LIBS) -lcrmcluster -lstonithd ++ $(DLMCONTROL_LIBS) -lcrmcluster -lstonithd -lcrmcommon + + ocfs2_controld.cman: $(CMAN_DAEMON_OBJS) $(LIBO2CB_DEPS) + $(LINK) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(OPENAIS_LIBS) \ diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes index 0454f81..734a15c 100644 --- a/ocfs2-tools.changes +++ b/ocfs2-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 29 05:16:05 UTC 2011 - tserong@suse.com + +- Add -lcrmcommon to fix ocfs2_controld build. + ------------------------------------------------------------------- Fri Apr 15 12:46:03 UTC 2011 - i@coly.li diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index 4e7a56a..dc2c6a9 100644 --- a/ocfs2-tools.spec +++ b/ocfs2-tools.spec @@ -22,7 +22,7 @@ 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 Summary: Oracle Cluster File System 2 Core Tools Version: 1.8.0 -Release: 0 +Release: 1 License: GPLv2+ Group: System/Filesystems Source: ocfs2-tools.tar.bz2 @@ -37,6 +37,7 @@ Patch106: ocfs2-devel.diff Patch107: reflink-no-syscall.patch Patch201: bug-543119-o2dlm.patch Patch202: fix-configure-check-libs.patch +Patch203: fix-ocfs2_controld-crmcommon-link.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 @@ -127,6 +128,7 @@ Authors: %patch107 -p0 %patch201 -p1 %patch202 -p1 +%patch203 -p1 %build %{?suse_update_config:%{suse_update_config -f}}