rpms
/
ocfs2-tools
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup wrong patching

This commit is contained in:
Fabio M. Di Nitto 2010-02-15 04:48:26 +00:00
parent 7f7473f02d
commit 61ec5ab442
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ocfs2-tools-1.4.3.dsolink.patch → no_stonithd.diff
View File

@ -6,7 +6,7 @@ diff -ru ocfs2-tools-1.4.3.orig/ocfs2_controld/Makefile ocfs2-tools-1.4.3/ocfs2_
$(LINK) $(GLIB_LIBS) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) \
$(OPENAIS_LIBS) $(COROSYNC_LIBS) \
- $(DLMCONTROL_LIBS) -lcrmcluster -lstonithd
+ $(DLMCONTROL_LIBS) -lcrmcluster -lcrmcommon -lstonithd
+ $(DLMCONTROL_LIBS) -lcrmcluster -lcrmcommon
ocfs2_controld.cman: $(CMAN_DAEMON_OBJS) $(LIBO2CB_DEPS)
$(LINK) $(LIBO2CB_LIBS) $(COM_ERR_LIBS) $(OPENAIS_LIBS) \

7
ocfs2-tools.spec
View File

@ -6,7 +6,7 @@
Summary: Tools for managing the Ocfs2 cluster file system
Name: ocfs2-tools
Version: 1.4.3
Release: 4%{?alphatag:.%{alphatag}}%{?dist}
Release: 5%{?alphatag:.%{alphatag}}%{?dist}
License: GPLv2
Group: System Environment/Base
# The source for this package was pulled from upstream's git repo and manually
@ -21,7 +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
Patch2: no_stonithd.diff
URL: http://oss.oracle.com/projects/ocfs2-tools/
Requires(post): chkconfig
Requires(preun): chkconfig
@ -215,6 +215,9 @@ fi
/usr/lib/ocf/resource.d/ocfs2
%changelog
* Mon Feb 15 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.4.3-5
- Update to use crmcommon and drop linking with stonithd
* Sun Feb 14 2010 Caolán McNamara <caolanm@redhat.com> - 1.4.3-4
- Resolves: rhbz#564744 fix FTBFS