Compare commits
6 Commits
| Author | SHA1 | Date |
|---|---|---|
Fedora Release Engineering
|
aee2858e80 | |
Bill Nottingham
|
c83eb01a68 | |
Fabio M. Di Nitto
|
f227cc2142 | |
|
Fabio M. Di Nitto
|
14747ae9a2 | |
|
Fabio M. Di Nitto
|
0bc5e7d51f | |
Jesse Keating
|
95327372e5 |
|
|
@ -1 +0,0 @@
|
|||
ocfs2-tools-1.4.2.tar.gz
|
||||
|
|
@ -0,0 +1 @@
|
|||
ocfs2-tools-1.4.3.tar.gz
|
||||
21
Makefile
21
Makefile
|
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: ocfs2-tools
|
||||
# $Id$
|
||||
NAME := ocfs2-tools
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
diff -Naurd ocfs2-tools-1.4.2.orig/ocfs2_controld/Makefile ocfs2-tools-1.4.2/ocfs2_controld/Makefile
|
||||
--- ocfs2-tools-1.4.2.orig/ocfs2_controld/Makefile 2009-04-14 00:10:40.000000000 +0200
|
||||
+++ ocfs2-tools-1.4.2/ocfs2_controld/Makefile 2009-08-31 16:15:04.000000000 +0200
|
||||
diff -Nuard 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 2009-04-14 00:10:40.000000000 +0200
|
||||
+++ ocfs2-tools-1.4.3/ocfs2_controld/Makefile 2009-09-30 08:22:04.000000000 +0200
|
||||
@@ -17,7 +17,7 @@
|
||||
PCMK_INCLUDES = -I/usr/include/pacemaker -I/usr/include/heartbeat/ $(GLIB_CFLAGS)
|
||||
endif
|
||||
|
|
@ -10,9 +10,9 @@ diff -Naurd ocfs2-tools-1.4.2.orig/ocfs2_controld/Makefile ocfs2-tools-1.4.2/ocf
|
|||
LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
|
||||
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
|
||||
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
|
||||
diff -Naurd ocfs2-tools-1.4.2.orig/ocfs2_controld/pacemaker.c ocfs2-tools-1.4.2/ocfs2_controld/pacemaker.c
|
||||
--- ocfs2-tools-1.4.2.orig/ocfs2_controld/pacemaker.c 2009-05-06 03:36:57.000000000 +0200
|
||||
+++ ocfs2-tools-1.4.2/ocfs2_controld/pacemaker.c 2009-08-31 16:18:15.000000000 +0200
|
||||
diff -Nuard ocfs2-tools-1.4.3.orig/ocfs2_controld/pacemaker.c ocfs2-tools-1.4.3/ocfs2_controld/pacemaker.c
|
||||
--- ocfs2-tools-1.4.3.orig/ocfs2_controld/pacemaker.c 2009-05-06 03:36:57.000000000 +0200
|
||||
+++ ocfs2-tools-1.4.3/ocfs2_controld/pacemaker.c 2009-09-30 08:22:22.000000000 +0200
|
||||
@@ -22,6 +22,7 @@
|
||||
|
||||
#include <bzlib.h>
|
||||
|
|
@ -21,3 +21,12 @@ diff -Naurd ocfs2-tools-1.4.2.orig/ocfs2_controld/pacemaker.c ocfs2-tools-1.4.2/
|
|||
#include <pacemaker/crm_config.h>
|
||||
/* heartbeat support is irrelevant here */
|
||||
#undef SUPPORT_HEARTBEAT
|
||||
@@ -155,7 +156,7 @@
|
||||
crm_log_init("ocfs2_controld", LOG_INFO, FALSE, TRUE, 0, NULL);
|
||||
|
||||
if(init_ais_connection(NULL, NULL, NULL, &local_node_uname, &our_nodeid) == FALSE) {
|
||||
- log_error("Connection to our AIS plugin (%d) failed", CRM_SERVICE);
|
||||
+ log_error("Connection to our AIS plugin (%d) failed", PCMK_SERVICE);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
Summary: Tools for managing the Ocfs2 cluster file system
|
||||
Name: ocfs2-tools
|
||||
Version: 1.4.2
|
||||
Release: 5%{?alphatag:.%{alphatag}}%{?dist}
|
||||
Version: 1.4.3
|
||||
Release: 3%{?alphatag:.%{alphatag}}%{?dist}
|
||||
License: GPLv2
|
||||
Group: System Environment/Base
|
||||
# The source for this package was pulled from upstream's git repo and manually
|
||||
|
|
@ -32,7 +32,7 @@ BuildRequires: e2fsprogs-devel, glib2-devel >= 2.2.3
|
|||
BuildRequires: libblkid-devel, bzip2-devel
|
||||
BuildRequires: pygtk2 >= 1.99.16, python-devel >= 2.5
|
||||
BuildRequires: ncurses-devel, readline-devel
|
||||
BuildRequires: openaislib-devel, clusterlib-devel
|
||||
BuildRequires: corosynclib-devel, openaislib-devel, clusterlib-devel
|
||||
BuildRequires: cluster-glue-libs-devel, pacemaker-libs-devel
|
||||
BuildRequires: libxml2-devel
|
||||
|
||||
|
|
@ -89,6 +89,7 @@ Summary: Tools for managing the Ocfs2 cluster file system (pacemaker component)
|
|||
Group: System Environment/Base
|
||||
Requires: pacemaker >= 1.0.5-1
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: dlm-pcmk
|
||||
|
||||
%description pcmk
|
||||
ocfs2-tools-pcmk contains the daemon required to use Ocfs2 with
|
||||
|
|
@ -212,6 +213,15 @@ fi
|
|||
/usr/lib/ocf/resource.d/ocfs2
|
||||
|
||||
%changelog
|
||||
* Fri Oct 9 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.4.3-3
|
||||
- Explicitly BuildRequires: corosynclib-devel
|
||||
|
||||
* Wed Sep 30 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.4.3-2
|
||||
- Fix -pcmk Requires.
|
||||
|
||||
* Wed Sep 30 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.4.3-1
|
||||
- New upstream release.
|
||||
|
||||
* Mon Sep 21 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 1.4.2-5
|
||||
- Fix pcmk resource agent.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue