[oprofile] * Mon Oct 15 2012 Will Cohen <wcohen at redhat.com> - 0.9.8-2 - Cleanup configure. - Add libpfm-devel t

[William Eden Cohen]

commit 44b1c17d0cc4203d367c0358819dd29444b3b4d5
Author: William Cohen <wcohen at redhat.com>
Date:   Mon Oct 15 16:06:14 2012 -0400

    * Mon Oct 15 2012 Will Cohen <wcohen at redhat.com> - 0.9.8-2
    - Cleanup configure.
    - Add libpfm-devel to the buildrequires.

 oprofile-0.9.8-ppc.patch |   11 +++++++++++
 oprofile.spec            |   27 +++++++++------------------
 2 files changed, 20 insertions(+), 18 deletions(-)
---
diff --git a/oprofile-0.9.8-ppc.patch b/oprofile-0.9.8-ppc.patch
new file mode 100644
index 0000000..40c1f56
--- /dev/null
+++ b/oprofile-0.9.8-ppc.patch
@@ -0,0 +1,11 @@
+--- oprofile-0.9.8/configure.ac.ppc	2012-08-27 14:59:13.000000000 -0400
++++ oprofile-0.9.8/configure.ac	2012-10-15 15:32:58.768284681 -0400
+@@ -104,7 +104,7 @@
+ if test "$HAVE_PERF_EVENTS" = "1"; then
+ 	PFM_LIB=
+ 	arch="`uname -m`"
+-	if test "$arch" = "ppc64"; then
++	if test "$arch" = "ppc64" || test "$arch" = "ppc"; then
+ 		AC_CHECK_HEADER(perfmon/pfmlib.h,,[AC_MSG_ERROR([pfmlib.h not found; usually provided in papi devel package])])
+ 		AC_CHECK_LIB(pfm,pfm_get_event_name, HAVE_LIBPFM3='1'; HAVE_LIBPFM='1', [
+ 			AC_CHECK_LIB(pfm,pfm_get_os_event_encoding, HAVE_LIBPFM3='0'; HAVE_LIBPFM='1',
diff --git a/oprofile.spec b/oprofile.spec
index be158da..0962061 100644
--- a/oprofile.spec
+++ b/oprofile.spec
@@ -1,7 +1,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/System
 #
@@ -12,6 +12,7 @@ Requires(pre): shadow-utils
 Requires(postun): shadow-utils
 Patch10: oprofile-0.4-guess2.patch
 Patch83: oprofile-0.9.7-xen.patch
+Patch99: oprofile-0.9.8-ppc.patch
 
 URL: http://oprofile.sf.net
 
@@ -29,6 +30,7 @@ BuildRequires: popt-devel
 BuildRequires: java-devel
 BuildRequires: jpackage-utils
 BuildRequires: java-1.7.0-openjdk-devel
+BuildRequires: libpfm-devel >= 4.3.0
 
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -75,6 +77,7 @@ agent library.
 %setup -q -n %{name}-%{version}
 %patch10 -p1 -b .guess2
 %patch83 -p1 -b .xen
+%patch99 -p1 -b .ppc
 
 ./autogen.sh
 
@@ -84,23 +87,7 @@ agent library.
 # bugzilla #113909
 CXXFLAGS=-g;     export CXXFLAGS
 
-./configure \
---with-kernel-support \
---host=%{_host} --target=%{_target_platform} --build=%{_build} \
---program-prefix= \
---prefix=%{_prefix} \
---exec-prefix=%{_exec_prefix} \
---bindir=%{_bindir} \
---sbindir=%{_sbindir} \
---sysconfdir=%{_sysconfdir} \
---datadir=%{_datadir} \
---includedir=%{_includedir} \
---libdir=%{_libdir} \
---libexecdir=%{_libexecdir} \
---localstatedir=%{_localstatedir} \
---sharedstatedir=%{_sharedstatedir} \
---mandir=%{_mandir} \
---infodir=%{_infodir} \
+%configure \
 --enable-gui=qt4 \
 --with-java=/usr/lib/jvm/java
 
@@ -181,6 +168,10 @@ exit 0
 %{_sysconfdir}/ld.so.conf.d/*
 
 %changelog
+* Mon Oct 15 2012 Will Cohen <wcohen at redhat.com> - 0.9.8-2
+- Cleanup configure.
+- Add libpfm-devel to the buildrequires.
+
 * Tue Sep 04 2012 Will Cohen <wcohen at redhat.com> - 0.9.8-1
 - Rebase on oprofile-0.9.8.