rpms/clustermon/devel clustermon-0.15.0-sparc.patch, NONE, 1.1 clustermon.spec, 1.8, 1.9

[Fabio M. Di Nitto]

Author: fabbione

Update of /cvs/pkgs/rpms/clustermon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25956

Modified Files:
	clustermon.spec 
Added Files:
	clustermon-0.15.0-sparc.patch 
Log Message:
Update for new cluster stuff and forward port sparc fix


clustermon-0.15.0-sparc.patch:

--- NEW FILE clustermon-0.15.0-sparc.patch ---
--- clustermon-0.15.0/ricci/modules/cluster/clumon/src/cim-provider/Makefile.orig	2009-02-02 21:46:05.000000000 -0600
+++ clustermon-0.15.0/ricci/modules/cluster/clumon/src/cim-provider/Makefile	2009-02-02 21:46:56.000000000 -0600
@@ -55,6 +55,14 @@
 	PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_ZSERIES64_GNU
 endif
 
+ifeq ($(PEGASUS_PLATFORM),sparc)
+	PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_SPARCV9_GNU
+endif
+
+ifeq ($(PEGASUS_PLATFORM),sparc64)
+	PEGASUS_CXXFLAGS = -DPEGASUS_PLATFORM_LINUX_SPARC64_GNU
+endif
+
 INCLUDE += -I ../include
 CXXFLAGS += $(PEGASUS_CXXFLAGS) -DPARANOIA=$(PARANOID)
 LDFLAGS += -shared -ldl -lcrypt -lcman


Index: clustermon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clustermon/devel/clustermon.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- clustermon.spec	15 Jan 2009 14:43:36 -0000	1.8
+++ clustermon.spec	3 Feb 2009 07:12:05 -0000	1.9
@@ -17,7 +17,7 @@
 
 Name: clustermon
 Version: 0.15.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga
 
@@ -25,9 +25,10 @@
 Summary: Monitoring and management of Red Hat Enterprise Linux Cluster Suite
 
 Source0: %{name}-%{version}.tar.gz
+Patch0:  clustermon-0.15.0-sparc.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: cmanlib-devel >= 2.99.10-4
+BuildRequires: clusterlib-devel
 BuildRequires: glibc-devel gcc-c++ libxml2-devel
 BuildRequires: openssl-devel dbus-devel pam-devel pkgconfig
 BuildRequires: net-snmp-devel tog-pegasus-devel
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure		--arch=%{_arch} \
@@ -182,6 +184,10 @@
 
 
 %changelog
+* Tue Feb  3 2009 Fabio M. Di Nitto <fdinitto at redhat.com> 0.15.0-8
+- Merge sparc support patch from F10 branch.
+- BuildRequires clusterlib-devel instead of cmanlib-devel.
+
 * Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> 0.15.0-7
 - rebuild with new openssl