diff --git a/ocfs2-tools-1.4.3.dsolink.patch b/ocfs2-tools-1.4.3.dsolink.patch new file mode 100644 index 0000000..8c9c606 --- /dev/null +++ b/ocfs2-tools-1.4.3.dsolink.patch @@ -0,0 +1,12 @@ +diff -ru ocfs2-tools-1.4.3.orig/ocfs2_controld/Makefile ocfs2-tools-1.4.3/ocfs2_controld/Makefile +--- ocfs2-tools-1.4.3.orig/ocfs2_controld/Makefile 2010-02-14 15:03:18.000000000 +0000 ++++ ocfs2-tools-1.4.3/ocfs2_controld/Makefile 2010-02-14 15:03:49.000000000 +0000 +@@ -67,7 +67,7 @@ + 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 -lcrmcommon -lstonithd + + ocfs2_controld.cman: $(CMAN_DAEMON_OBJS) $(LIBO2CB_DEPS) + $(LINK) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(OPENAIS_LIBS) \ diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index 0edb337..6f8b61d 100644 --- a/ocfs2-tools.spec +++ b/ocfs2-tools.spec @@ -6,7 +6,7 @@ Summary: Tools for managing the Ocfs2 cluster file system Name: ocfs2-tools Version: 1.4.3 -Release: 3%{?alphatag:.%{alphatag}}%{?dist} +Release: 4%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2 Group: System Environment/Base # The source for this package was pulled from upstream's git repo and manually @@ -21,6 +21,7 @@ Group: System Environment/Base Source0: %{name}-%{version}.tar.gz Patch0: minor_build_fixes.diff Patch1: o2cb_pcmk.diff +Patch2: ocfs2-tools-1.4.3.dsolink.patch URL: http://oss.oracle.com/projects/ocfs2-tools/ Requires(post): chkconfig Requires(preun): chkconfig @@ -99,6 +100,7 @@ pacemaker cluster manager %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %{configure} \ @@ -213,6 +215,9 @@ fi /usr/lib/ocf/resource.d/ocfs2 %changelog +* Sun Feb 14 2010 Caolán McNamara - 1.4.3-4 +- Resolves: rhbz#564744 fix FTBFS + * Fri Oct 9 2009 Fabio M. Di Nitto - 1.4.3-3 - Explicitly BuildRequires: corosynclib-devel