rpms/openais/devel openais-0.78-s390-build.patch, NONE, 1.1 openais-0.78-timer-thread-fix.patch, NONE, 1.1 openais.spec, 1.5, 1.6

[fedora-cvs-commits at redhat.com]

Author: sdake

Update of /cvs/dist/rpms/openais/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30490/devel

Modified Files:
	openais.spec 
Added Files:
	openais-0.78-s390-build.patch 
	openais-0.78-timer-thread-fix.patch 
Log Message:
auto-import openais-0.78-1.2 on branch devel from openais-0.78-1.2.src.rpm

openais-0.78-s390-build.patch:
 Makefile |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE openais-0.78-s390-build.patch ---
diff -uNr openais-0.78.orig/Makefile openais-0.78/Makefile
--- openais-0.78.orig/Makefile	2006-07-10 20:28:11.000000000 -0400
+++ openais-0.78/Makefile	2006-07-10 20:29:07.000000000 -0400
@@ -48,6 +48,12 @@
 ifeq (ia64,$(ARCH))
 LIBDIR=/usr/lib/openais
 endif
+ifeq (s390,$(ARCH))
+LIBDIR=/usr/lib/openais
+endif
+ifeq (s390x,$(ARCH))
+LIBDIR=/usr/lib64/openais
+endif
 
 all:
 	(cd lcr; echo ==== `pwd` ===; $(MAKE) all);

openais-0.78-timer-thread-fix.patch:
 main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openais-0.78-timer-thread-fix.patch ---
Index: exec/main.c
===================================================================
--- exec/main.c	(revision 1111)
+++ exec/main.c	(working copy)
@@ -375,6 +375,8 @@
  	int totem_log_service;
  	log_init ("MAIN");
 
+	aisexec_tty_detach ();
+
 	log_printf (LOG_LEVEL_NOTICE, "AIS Executive Service RELEASE '%s'\n", RELEASE_VERSION);
 	log_printf (LOG_LEVEL_NOTICE, "Copyright (C) 2002-2006 MontaVista Software, Inc and contributors.\n");
 	log_printf (LOG_LEVEL_NOTICE, "Copyright (C) 2006 Red Hat, Inc.\n");
@@ -554,8 +556,6 @@
 		gid_valid,
 		&this_non_loopback_ip);
 
-	aisexec_tty_detach ();
-
 	log_printf (LOG_LEVEL_NOTICE, "AIS Executive Service: started and ready to provide service.\n");
 
 	/*


Index: openais.spec
===================================================================
RCS file: /cvs/dist/rpms/openais/devel/openais.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openais.spec	7 Jul 2006 21:01:57 -0000	1.5
+++ openais.spec	11 Jul 2006 01:24:26 -0000	1.6
@@ -1,15 +1,17 @@
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
 Version: 0.78
-Release: 1.1
+Release: 1.2
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
 Source0: http://developer.osdl.org/dev/openais/downloads/openais-%{version}/openais-%{version}.tar.gz
 Patch0: openais-0.76-defaultconfig.patch
 Patch1: openais-0.78-ia64-build.patch
+Patch2: openais-0.78-s390-build.patch
+Patch3: openais-0.78-timer-thread-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: i386 ppc x86_64 ppc64 ia64
+ExclusiveArch: i386 ppc x86_64 ppc64 ia64 s390 s390x
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -33,6 +35,8 @@
 %setup -q -n openais-%{version}
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
+%patch3 -p0
 
 %build
 # -O3 required for performance reasons
@@ -162,6 +166,9 @@
 %{_mandir}/man3/evs_membership_get.3*
 
 %changelog
+* Mon Jul 10 2006 Steven Dake <sdake at redhat.com> - 0.78-1.2
+- Allow build on s390 and s390x.
+
 * Fri Jul 07 2006 Steven Dake <sdake at redhat.com> - 0.78-1.1
 - Allow build on ia64.