rpms/ocfs2-tools/devel ocfs2-tools-1.4.3.dsolink.patch, NONE, 1.1 ocfs2-tools.spec, 1.15, 1.16

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/ocfs2-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3407

Modified Files:
	ocfs2-tools.spec 
Added Files:
	ocfs2-tools-1.4.3.dsolink.patch 
Log Message:
Resolves: rhbz#564744 fix FTBFS

ocfs2-tools-1.4.3.dsolink.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ocfs2-tools-1.4.3.dsolink.patch ---
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) \


Index: ocfs2-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/devel/ocfs2-tools.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ocfs2-tools.spec	9 Oct 2009 07:27:07 -0000	1.15
+++ ocfs2-tools.spec	14 Feb 2010 15:08:23 -0000	1.16
@@ -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 <caolanm at redhat.com> - 1.4.3-4
+- Resolves: rhbz#564744 fix FTBFS
+
 * Fri Oct  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.3-3
 - Explicitly BuildRequires: corosynclib-devel