From b18801ba5f324cf2f8fdd75caf929605348010d5 Mon Sep 17 00:00:00 2001
From: William Cohen <wcohen@redhat.com>
Date: Sun, 26 Aug 2012 20:30:51 -0400
Subject: [PATCH] Rebase to 5.0.0.

---
 .gitignore |  1 +
 papi.spec  | 17 +++++++++--------
 sources    |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 20482c4..019722b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ papi-4.1.0.tar.gz
 /papi-4.2.0.tar.gz
 /papi-4.2.1.tar.gz
 /papi-4.4.0.tar.gz
+/papi-5.0.0.tar.gz
diff --git a/papi.spec b/papi.spec
index b873380..0773663 100644
--- a/papi.spec
+++ b/papi.spec
@@ -1,13 +1,12 @@
-%bcond_with bundled_libpfm
+%bcond_without bundled_libpfm
 Summary: Performance Application Programming Interface
 Name: papi
-Version: 4.4.0
-Release: 5%{?dist}
+Version: 5.0.0
+Release: 1%{?dist}
 License: BSD
 Group: Development/System
 URL: http://icl.cs.utk.edu/papi/
 Source0: http://icl.cs.utk.edu/projects/papi/downloads/%{name}-%{version}.tar.gz
-Patch1: papi-siginfo.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ncurses-devel
 BuildRequires: gcc-gfortran
@@ -48,7 +47,6 @@ the PAPI user-space libraries and interfaces.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %if %{without bundled_libpfm}
@@ -60,9 +58,9 @@ cd src
 %configure --with-libpfm4 \
 %{?libpfm_config} \
 --with-static-lib=yes --with-shared-lib=yes --with-shlib \
---with-components="coretemp example lmsensors lustre mx net"
+--with-components="appio coretemp example lmsensors lustre mx net rapl stealtime"
 #components currently left out because of build configure/build issues
-#--with-components="appio cuda infiniband vmware"
+#--with-components="appio cuda vmware"
 
 pushd components
 #pushd cuda; ./configure; popd
@@ -101,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_includedir}/*.h
 %if %{with bundled_libpfm}
-%{_includedir}/perfmon/*.h
+#%{_includedir}/perfmon/*.h
 %endif
 %{_libdir}/*.so
 %doc %{_mandir}/man3/*
@@ -111,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Fri Aug 24 2012 William Cohen <wcohen@redhat.com> - 5.0.0-1
+- Rebase to 5.0.0.
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.4.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 6c598dc..721ea95 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2844448db0b53441a55487881b955ea5  papi-4.4.0.tar.gz
+7d6f2a0a3785f25cb4122923522db247  papi-5.0.0.tar.gz