[oprofile] Rebase on oprofile-0.9.8.

[William Eden Cohen]

commit 80792ed6994bc7cafb2bb7a9915d9d7cb1e14bc7
Author: William Cohen <wcohen at redhat.com>
Date:   Tue Sep 4 11:48:54 2012 -0400

     Rebase on oprofile-0.9.8.

 .gitignore               |    1 +
 oprofile-0.9.7-xen.patch |    8 ++++----
 oprofile-autogen.patch   |   31 -------------------------------
 oprofile.spec            |   20 ++++++++------------
 sources                  |    2 +-
 5 files changed, 14 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1859d64..9ff8b07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 oprofile-0.9.6.tar.gz
 /oprofile-0.9.7.tar.gz
+/oprofile-0.9.8.tar.gz
diff --git a/oprofile-0.9.7-xen.patch b/oprofile-0.9.7-xen.patch
index 7ad0ac7..8a7ef31 100644
--- a/oprofile-0.9.7-xen.patch
+++ b/oprofile-0.9.7-xen.patch
@@ -461,8 +461,8 @@ diff -up oprofile-0.9.7/doc/opcontrol.1.in.xen oprofile-0.9.7/doc/opcontrol.1.in
 +between the images and domains is based on the order they are
 +specified in both options.
  .br
- 
- .SH ENVIRONMENT
+ .SH OPTIONS (specific to System z)
+ .TP
 diff -up oprofile-0.9.7/libpp/format_output.cpp.xen oprofile-0.9.7/libpp/format_output.cpp
 --- oprofile-0.9.7/libpp/format_output.cpp.xen	2011-07-04 22:25:04.000000000 -0400
 +++ oprofile-0.9.7/libpp/format_output.cpp	2011-11-28 16:25:07.592000010 -0500
@@ -497,8 +497,8 @@ diff -up oprofile-0.9.7/utils/opcontrol.xen oprofile-0.9.7/utils/opcontrol
 +   --passive-images=file[,files] list of kernel images associated with each passive domain
 +     or 
 +   --domain-images=file[,files]
- EOF
- }
+ 
+   System z specific options
  
 @@ -388,6 +395,9 @@ do_init()
  	SETUP_FILE="$SETUP_DIR/daemonrc"
diff --git a/oprofile.spec b/oprofile.spec
index 1d9c287..be158da 100644
--- a/oprofile.spec
+++ b/oprofile.spec
@@ -1,7 +1,7 @@
 Summary: System wide profiler
 Name: oprofile
-Version: 0.9.7
-Release: 5%{?dist}
+Version: 0.9.8
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/System
 #
@@ -12,7 +12,6 @@ Requires(pre): shadow-utils
 Requires(postun): shadow-utils
 Patch10: oprofile-0.4-guess2.patch
 Patch83: oprofile-0.9.7-xen.patch
-Patch200: oprofile-autogen.patch
 
 URL: http://oprofile.sf.net
 
@@ -76,7 +75,6 @@ agent library.
 %setup -q -n %{name}-%{version}
 %patch10 -p1 -b .guess2
 %patch83 -p1 -b .xen
-%patch200 -p1 -b .autogen
 
 ./autogen.sh
 
@@ -155,15 +153,10 @@ exit 0
 %{_bindir}/oprofiled
 %{_bindir}/oparchive
 %{_bindir}/opjitconv
+%{_bindir}/op-check-perfevents
+%{_bindir}/operf
 
-%{_mandir}/man1/ophelp.1.gz
-%{_mandir}/man1/opannotate.1.gz
-%{_mandir}/man1/opcontrol.1.gz
-%{_mandir}/man1/opgprof.1.gz
-%{_mandir}/man1/opreport.1.gz
-%{_mandir}/man1/oprofile.1.gz
-%{_mandir}/man1/oparchive.1.gz
-%{_mandir}/man1/opimport.1.gz
+%{_mandir}/man1/*
 
 %{_datadir}/oprofile
 
@@ -188,6 +181,9 @@ exit 0
 %{_sysconfdir}/ld.so.conf.d/*
 
 %changelog
+* Tue Sep 04 2012 Will Cohen <wcohen at redhat.com> - 0.9.8-1
+- Rebase on oprofile-0.9.8.
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 80f316e..8f1e6fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8b5d1d9b65f84420bcc3234777ad3be3  oprofile-0.9.7.tar.gz
+6d127023af1dd1cf24e15411229f3cc8  oprofile-0.9.8.tar.gz