rpms/ganglia/devel ganglia-3.1.0-r1399-ppc64build.patch, NONE, 1.1 ganglia.spec, 1.14, 1.15

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/ganglia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11292

Modified Files:
	ganglia.spec 
Added Files:
	ganglia-3.1.0-r1399-ppc64build.patch 
Log Message:
* Fri Jun 13 2008 Jarod Wilson <jwilson at redhat.com> 3.1.0-0.2.r1399
- Work-around for incorrectly hard-coded libdir on ppc64


ganglia-3.1.0-r1399-ppc64build.patch:

--- NEW FILE ganglia-3.1.0-r1399-ppc64build.patch ---
--- ganglia-3.1.0.1399/configure.in.orig	2008-06-13 10:23:06.000000000 -0400
+++ ganglia-3.1.0.1399/configure.in	2008-06-13 10:23:24.000000000 -0400
@@ -574,7 +574,7 @@ if test "x$prefix" = xNONE; then
   prefix="$ac_default_prefix"
 fi
 
-if test "x$host_cpu" = "xx86_64"; then
+if test "x$host_cpu" = "xx86_64" || test "x$host_cpu" = "xppc64"; then
   libdir="$prefix/lib64"
 else
   libdir="$prefix/lib"
--- ganglia-3.1.0.1399/configure.orig	2008-06-13 10:24:45.000000000 -0400
+++ ganglia-3.1.0.1399/configure	2008-06-13 10:25:33.000000000 -0400
@@ -24225,7 +24225,7 @@ if test "x$prefix" = xNONE; then
   prefix="$ac_default_prefix"
 fi
 
-if test "x$host_cpu" = "xx86_64"; then
+if test "x$host_cpu" = "xx86_64" || test "x$host_cpu" = "xppc64"; then
   libdir="$prefix/lib64"
 else
   libdir="$prefix/lib"


Index: ganglia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ganglia/devel/ganglia.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ganglia.spec	11 Jun 2008 19:43:57 -0000	1.14
+++ ganglia.spec	13 Jun 2008 14:28:44 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:               ganglia
 Version:            3.1.0
-Release:            0.1%{?svnrev:.r%{svnrev}}%{?dist}
+Release:            0.2%{?svnrev:.r%{svnrev}}%{?dist}
 Summary:            Ganglia Distributed Monitoring System
 
 Group:              Applications/Internet
@@ -10,6 +10,7 @@
 URL:                http://ganglia.sourceforge.net/
 Source0:            http://www.ganglia.info/snapshots/3.1.x/%{name}-%{version}.%{svnrev}.tar.gz
 #Source0:            http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Patch0:             ganglia-3.1.0-r1399-ppc64build.patch
 Buildroot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:      rrdtool-devel, apr-devel >= 1
@@ -89,6 +90,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}.%{svnrev}
+%patch0 -p1
 ## Hey, those shouldn't be executable...
 chmod -x lib/*.{h,x}
 
@@ -250,6 +252,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Fri Jun 13 2008 Jarod Wilson <jwilson at redhat.com> 3.1.0-0.2.r1399
+- Work-around for incorrectly hard-coded libdir on ppc64
+
 * Wed Jun 11 2008 Jarod Wilson <jwilson at redhat.com> 3.1.0-0.1.r1399
 - Update to 3.1.x pre-release snapshot, svn rev 1399