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

- Add -lcrmcommon to fix ocfs2_controld build.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=29
This commit is contained in:
Tim Serong 2011-08-29 05:17:10 +00:00 committed by Git OBS Bridge
parent d90ef31692
commit 15b98fc50e
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fix-ocfs2_controld-crmcommon-link.patch Normal file
View File

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

5
ocfs2-tools.changes
View File

@ -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 Fri Apr 15 12:46:03 UTC 2011 - i@coly.li

4
ocfs2-tools.spec
View File

@ -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 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 Summary: Oracle Cluster File System 2 Core Tools
Version: 1.8.0 Version: 1.8.0
Release: 0 Release: 1
License: GPLv2+ License: GPLv2+
Group: System/Filesystems Group: System/Filesystems
Source: ocfs2-tools.tar.bz2 Source: ocfs2-tools.tar.bz2
@ -37,6 +37,7 @@ Patch106: ocfs2-devel.diff
Patch107: reflink-no-syscall.patch Patch107: reflink-no-syscall.patch
Patch201: bug-543119-o2dlm.patch Patch201: bug-543119-o2dlm.patch
Patch202: fix-configure-check-libs.patch Patch202: fix-configure-check-libs.patch
Patch203: fix-ocfs2_controld-crmcommon-link.patch
Url: http://oss.oracle.com/projects/ocfs2-tools/ Url: http://oss.oracle.com/projects/ocfs2-tools/
Requires: net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3 Requires: net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3
PreReq: %insserv_prereq %fillup_prereq PreReq: %insserv_prereq %fillup_prereq
@ -127,6 +128,7 @@ Authors:
%patch107 -p0 %patch107 -p0
%patch201 -p1 %patch201 -p1
%patch202 -p1 %patch202 -p1
%patch203 -p1
%build %build
%{?suse_update_config:%{suse_update_config -f}} %{?suse_update_config:%{suse_update_config -f}}