rpms/ocfs2-tools/F-12 .cvsignore, 1.3, 1.4 minor_build_fixes.diff, 1.1, 1.2 ocfs2-tools.spec, 1.12, 1.13 sources, 1.3, 1.4

[Fabio M. Di Nitto]

Author: fabbione

Update of /cvs/pkgs/rpms/ocfs2-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12547

Modified Files:
	.cvsignore minor_build_fixes.diff ocfs2-tools.spec sources 
Log Message:
New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Sep 2009 11:13:54 -0000	1.3
+++ .cvsignore	30 Sep 2009 06:53:30 -0000	1.4
@@ -1 +1 @@
-ocfs2-tools-1.4.2.tar.gz
+ocfs2-tools-1.4.3.tar.gz

minor_build_fixes.diff:
 Makefile    |    2 +-
 pacemaker.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

Index: minor_build_fixes.diff
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/F-12/minor_build_fixes.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- minor_build_fixes.diff	2 Sep 2009 11:13:54 -0000	1.1
+++ minor_build_fixes.diff	30 Sep 2009 06:53:30 -0000	1.2
@@ -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
  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
  #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;
+ 	}
+ 


Index: ocfs2-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/F-12/ocfs2-tools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ocfs2-tools.spec	21 Sep 2009 07:56:03 -0000	1.12
+++ ocfs2-tools.spec	30 Sep 2009 06:53:30 -0000	1.13
@@ -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: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 # The source for this package was pulled from upstream's git repo and manually
@@ -212,6 +212,9 @@ fi
 /usr/lib/ocf/resource.d/ocfs2
 
 %changelog
+* Wed Sep 30 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.3-1
+- New upstream release.
+
 * Mon Sep 21 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.4.2-5
 - Fix pcmk resource agent.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocfs2-tools/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Sep 2009 11:13:54 -0000	1.3
+++ sources	30 Sep 2009 06:53:30 -0000	1.4
@@ -1 +1 @@
-1dfc4a4ba72ba96250b508c8e27af981  ocfs2-tools-1.4.2.tar.gz
+7d8895ea41999ce8f468e2bc7dc55ddc  ocfs2-tools-1.4.3.tar.gz