Rebase to 5.1.1.

.gitignore

@@ -8,3 +8,4 @@ papi-4.1.0.tar.gz
 /papi-5.0.0.tar.gz
 /papi-5.0.1.tar.gz
 /papi-5.1.0.2.tar.gz
+/papi-5.1.1.tar.gz

papi-rmb.patch

@@ -1,31 +0,0 @@
-From 4375fe0bd76f6a05c93c3334f8f2ab7aaa7d29f4 Mon Sep 17 00:00:00 2001
-From: William Cohen <wcohen@redhat.com>
-Date: Mon, 15 Apr 2013 17:22:16 -0400
-Subject: [PATCH] Use rmb() for the missing mb() definition
-
-Commit 59d3d7584b2925bd05b4b5d0f4fe89666eb8494a removed the definition of
-mb().  mb() was defined as rmb().  This just corrects it back.
-
-Signed-off-by: William Cohen <wcohen@redhat.com>
----
- src/linux-lock.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/linux-lock.h b/src/linux-lock.h
-index 741e352..6fe1da5 100644
---- a/src/linux-lock.h
-+++ b/src/linux-lock.h
-@@ -186,8 +186,8 @@ static inline int __arm_papi_spin_lock (volatile unsigned int *lock)
- 
-   return 0;
- }
--#define _papi_hwd_lock(lck)   { mb(); __arm_papi_spin_lock(&_papi_hwd_lock_data[lck]); mb(); }
--#define _papi_hwd_unlock(lck) { mb(); _papi_hwd_lock_data[lck] = 0; mb(); }
-+#define _papi_hwd_lock(lck)   { rmb(); __arm_papi_spin_lock(&_papi_hwd_lock_data[lck]); rmb(); }
-+#define _papi_hwd_unlock(lck) { rmb(); _papi_hwd_lock_data[lck] = 0; rmb(); }
- 
- #elif defined(__mips__)
- static inline void __raw_spin_lock(volatile unsigned int *lock)
--- 
-1.8.1.4
-

papi.spec

@@ -1,13 +1,12 @@
 %bcond_with bundled_libpfm
 Summary: Performance Application Programming Interface
 Name: papi
-Version: 5.1.0.2
-Release: 2%{?dist}
+Version: 5.1.1
+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
-Patch10: papi-rmb.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ncurses-devel
 BuildRequires: gcc-gfortran
@@ -47,8 +46,7 @@ PAPI-static includes the static versions of the library files for
 the PAPI user-space libraries and interfaces.
 
 %prep
-%setup -q -n papi-5.1.0
-%patch10 -p1 -b .rmb
+%setup -q
 
 %build
 %if %{without bundled_libpfm}
@@ -111,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Thu May 30 2013 William Cohen <wcohen@redhat.com> - 5.1.1-1
+- Rebase to 5.1.1
+
 * Mon Apr 15 2013 William Cohen <wcohen@redhat.com> - 5.1.0.2-2
 - Fix arm FTBS rhbz 951806.
 

sources

@@ -1 +1 @@
-e1f2d412e7cc249ba487ed50cfcd1f4a  papi-5.1.0.2.tar.gz
+055c5b3d7f5223ab46fd720f1c3e0749  papi-5.1.1.tar.gz