5 changed files with 304 additions and 402 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,22 +3,3 @@ papi-4.1.0.tar.gz
 /papi-4.1.2.1.tar.gz
 /papi-4.1.3.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
-/papi-5.0.1.tar.gz
-/papi-5.1.0.2.tar.gz
-/papi-5.1.1.tar.gz
-/papi-5.2.0.tar.gz
-/papi-5.2.0-2.37.g5c1405a.tar.gz
-/papi-5.2.0-2.63.g91a6fa5.tar.gz
-/papi-5.2.0-2.1.gff3e15d.tar.gz
-/papi-5.3.0.tar.gz
-/papi-5.3.0-1.16.ga7f6159.tar.gz
-/papi-5.3.2.tar.gz
-/papi-5.4.0.tar.gz
-/papi-5.4.1.tar.gz
-/papi-5.4.3.tar.gz
-/papi-5.5.0.tar.gz
-/papi-5.5.1.tar.gz
-/papi-5.6.0.tar.gz
--- a/papi-coretemp.patch
+++ b/papi-coretemp.patch
@ -0,0 +1,269 @@
+diff -up papi-4.2.0/src/components/coretemp/linux-coretemp.c.orig papi-4.2.0/src/components/coretemp/linux-coretemp.c
+--- papi-4.2.0/src/components/coretemp/linux-coretemp.c.orig	2011-10-31 11:14:17.986533514 -0400
+++ papi-4.2.0/src/components/coretemp/linux-coretemp.c	2011-10-31 11:15:40.593663642 -0400
+@@ -13,6 +13,8 @@
+ 
+ #define INVALID_RESULT -1000000L
+ 
+papi_vector_t _coretemp_vector;
+
+ /* temporary event */
+ struct temp_event {
+   char name[PAPI_MAX_STR_LEN];
+@@ -23,8 +25,8 @@ struct temp_event {
+ };
+ 
+ static struct temp_event* root = NULL;
+-static CORETEMP_native_enent_entry_t * _coretemp_native_events;
+-static int NUM_EVENTS		= 0;
+static CORETEMP_native_event_entry_t * _coretemp_native_events;
+static int num_events		= 0;
+ static int is_initialized	= 0;
+ 
+ /*******************************************************************************
+@@ -146,17 +148,17 @@ int coretemp_init_substrate( )
+   is_initialized = 1;
+   /* This is the prefered method, all coretemp sensors are symlinked here
+    * see $(kernel_src)/Documentation/hwmon/sysfs-interface */
+-  NUM_EVENTS = generateEventList("/sys/class/hwmon");
+  num_events = generateEventList("/sys/class/hwmon");
+ 
+-  if ( NUM_EVENTS < 0 ) 
+-	return ( NUM_EVENTS );
+  if ( num_events < 0 ) 
+	return ( num_events );
+ 
+-  if ( NUM_EVENTS == 0 ) 
+  if ( num_events == 0 ) 
+ 	return ( PAPI_OK );
+ 
+   t = root;
+-  _coretemp_native_events = (CORETEMP_native_enent_entry_t*)
+-	papi_malloc(sizeof(CORETEMP_native_enent_entry_t) * NUM_EVENTS);
+  _coretemp_native_events = (CORETEMP_native_event_entry_t*)
+	papi_malloc(sizeof(CORETEMP_native_event_entry_t) * num_events);
+ 
+   do {
+ 	strncpy(_coretemp_native_events[i].name,t->name,PAPI_MAX_STR_LEN);
+@@ -169,7 +171,10 @@ int coretemp_init_substrate( )
+ 	i++;
+   } while (t != NULL);
+   root = NULL;
+-  return (PAPI_OK);
+
+  _coretemp_vector.cmp_info.num_native_events = num_events;
+
+  return PAPI_OK;
+ }
+ 
+ 
+@@ -206,7 +211,7 @@ int coretemp_init_control_state( hwd_con
+ {
+   int i;
+ 
+-  for ( i=0; i < NUM_EVENTS; i++ )
+  for ( i=0; i < num_events; i++ )
+ 	( ( CORETEMP_control_state_t *) ctl )->counts[i] = getEventValue(i);
+   
+   ( ( CORETEMP_control_state_t *) ctl)->lastupdate = PAPI_get_real_usec();
+@@ -233,7 +238,7 @@ int coretemp_read( hwd_context_t *ctx, h
+   int i;
+ 
+   if ( now - control->lastupdate > REFRESH_LAT ) {
+-	for ( i = 0; i < NUM_EVENTS; i++ ) {
+	for ( i = 0; i < num_events; i++ ) {
+ 	  control->counts[i] = getEventValue( i );
+ 	}
+ 	control->lastupdate = now;
+@@ -250,7 +255,7 @@ int coretemp_stop( hwd_context_t *ctx, h
+   CORETEMP_control_state_t* control = (CORETEMP_control_state_t*) ctl;
+   int i;
+ 
+-  for ( i = 0; i < NUM_EVENTS; i++ ) {
+  for ( i = 0; i < num_events; i++ ) {
+ 	control->counts[i] = getEventValue( i );
+   }
+ 
+@@ -376,27 +381,31 @@ coretemp_ntv_enum_events( unsigned int *
+ 
+ 	switch ( modifier ) {
+ 	case PAPI_ENUM_FIRST:
+
+	  if (num_events==0) {
+	    return PAPI_ENOEVNT;
+	  }
+ 		*EventCode = PAPI_NATIVE_MASK | PAPI_COMPONENT_MASK( cidx );
+ 
+-		return ( PAPI_OK );
+		return PAPI_OK;
+ 		break;
+ 
+ 	case PAPI_ENUM_EVENTS:
+ 	{
+ 		int index = *EventCode & PAPI_NATIVE_AND_MASK & PAPI_COMPONENT_AND_MASK;
+ 
+-		if ( index < NUM_EVENTS - 1 ) {
+		if ( index < num_events - 1 ) {
+ 			*EventCode = *EventCode + 1;
+-			return ( PAPI_OK );
+			return PAPI_OK;
+ 		} else
+-			return ( PAPI_ENOEVNT );
+			return PAPI_ENOEVNT;
+ 
+ 		break;
+ 	}
+ 	default:
+-		return ( PAPI_EINVAL );
+		return PAPI_EINVAL;
+ 	}
+-	return ( PAPI_EINVAL );
+	return PAPI_EINVAL;
+ }
+ 
+ /*
+@@ -407,7 +416,7 @@ coretemp_ntv_code_to_name( unsigned int 
+ {
+ 	int index = EventCode & PAPI_NATIVE_AND_MASK & PAPI_COMPONENT_AND_MASK;
+ 
+-	if ( index >= 0 && index < NUM_EVENTS ) {
+	if ( index >= 0 && index < num_events ) {
+ 	  strncpy( name, _coretemp_native_events[index].name, len );
+ 	  return ( PAPI_OK );
+ 	}
+@@ -422,7 +431,7 @@ coretemp_ntv_code_to_descr( unsigned int
+ {
+ 	int index = EventCode & PAPI_NATIVE_AND_MASK & PAPI_COMPONENT_AND_MASK;
+ 
+-	if ( index >= 0 && index < NUM_EVENTS ) {
+	if ( index >= 0 && index < num_events ) {
+ 	
+ 	  strncpy( name, _coretemp_native_events[index].description, len );
+ 	}
+@@ -437,7 +446,7 @@ coretemp_ntv_code_to_bits( unsigned int 
+ {
+ 	int index = EventCode & PAPI_NATIVE_AND_MASK & PAPI_COMPONENT_AND_MASK;
+ 
+-	if ( 0 > index || NUM_EVENTS <= index )
+	if ( 0 > index || num_events <= index )
+ 	  return ( PAPI_ENOEVNT );
+ 	memcpy( ( CORETEMP_register_t * ) bits,
+ 			&( _coretemp_native_events[index].resources ),
+@@ -454,8 +463,8 @@ papi_vector_t _coretemp_vector = {
+ 	.cmp_info = {
+ 				 /* default component information (unspecified values are initialized to 0) */
+ 				 .name =
+-				 "$Id: linux-coretemp.c,v 1.13 2011/10/25 15:20:41 vweaver1 Exp $",
+-				 .version = "$Revision: 1.13 $",
+				 "$Id: linux-coretemp.c,v 1.16 2011/10/28 16:03:51 vweaver1 Exp $",
+				 .version = "$Revision: 1.16 $",
+ 				 .num_mpx_cntrs = PAPI_MPX_DEF_DEG,
+ 				 .num_cntrs = CORETEMP_MAX_COUNTERS,
+ 				 .default_domain = PAPI_DOM_USER,
+diff -up papi-4.2.0/src/components/coretemp/linux-coretemp.h.orig papi-4.2.0/src/components/coretemp/linux-coretemp.h
+--- papi-4.2.0/src/components/coretemp/linux-coretemp.h.orig	2011-10-31 11:14:25.471534638 -0400
+++ papi-4.2.0/src/components/coretemp/linux-coretemp.h	2011-10-31 11:15:40.620534716 -0400
+@@ -4,7 +4,7 @@
+ 
+ /** 
+  * @file    linux-coretemp.h
+- * CVS:     $Id: linux-coretemp.h,v 1.1 2010/08/31 20:54:23 ralph Exp $
+ * CVS:     $Id: linux-coretemp.h,v 1.2 2011/10/28 15:55:56 vweaver1 Exp $
+  * @author  James Ralph
+  *			ralph@eecs.utk.edu
+  *
+@@ -20,8 +20,8 @@
+  *  - Based heavily upon the lm-sensors component by Heike Jagode.
+  */
+ 
+-#ifndef _PAPI_LMSENSORS_H
+-#define _PAPI_LMSENSORS_H
+#ifndef _PAPI_CORETEMP_H
+#define _PAPI_CORETEMP_H
+ 
+ #include <unistd.h>
+ #include <dirent.h>
+@@ -53,14 +53,13 @@ typedef struct CORETEMP_register
+ /** This structure is used to build the table of events */
+ typedef struct CORETEMP_native_event_entry
+ {
+-	/*LM_SENSORS_register_t resources; */
+   char name[PAPI_MAX_STR_LEN];
+   char description[PAPI_MAX_STR_LEN];
+   char path[PATH_MAX];
+   int stone; /* some counters are set in stone, a max temperature is just that... */
+   long value;
+   CORETEMP_register_t resources;
+-} CORETEMP_native_enent_entry_t;
+} CORETEMP_native_event_entry_t;
+ 
+ typedef struct CORETEMP_reg_alloc
+ {
+@@ -86,4 +85,4 @@ typedef struct CORETEMP_context
+  *******************************************************************************/
+ 
+ 
+-#endif /* _PAPI_LMSENSORS_H */
+#endif /* _PAPI_CORETEMP_H */
+diff -up papi-4.2.0/src/components/coretemp/Rules.coretemp.orig papi-4.2.0/src/components/coretemp/Rules.coretemp
+diff -up papi-4.2.0/src/components/coretemp/tests/coretemp_basic.c.orig papi-4.2.0/src/components/coretemp/tests/coretemp_basic.c
+--- papi-4.2.0/src/components/coretemp/tests/coretemp_basic.c.orig	2011-10-31 11:14:52.345550487 -0400
+++ papi-4.2.0/src/components/coretemp/tests/coretemp_basic.c	2011-10-31 11:15:40.621532177 -0400
+@@ -27,7 +27,8 @@ int main (int argc, char **argv)
+ 	int code;
+ 	char event_name[PAPI_MAX_STR_LEN];
+ 	int total_events=0;
+-
+	int r;
+	const PAPI_component_info_t *cmpinfo = NULL;
+ 
+         /* Set TESTS_QUIET variable */
+         tests_quiet( argc, argv );      
+@@ -46,14 +47,21 @@ int main (int argc, char **argv)
+ 
+ 	for(cid=0; cid<numcmp; cid++) {
+ 
+-	   if (!TESTS_QUIET) printf("\tComponent %d\n",cid);
+	   if (!TESTS_QUIET) {
+	      if ( (cmpinfo = PAPI_get_component_info(cid)) == NULL) {
+	         test_fail(__FILE__, __LINE__,"PAPI_get_component_info failed\n", 0);
+	      }
+	      printf("\tComponent %d - %s\n", cid, cmpinfo->name);
+	   }
+ 
+ 	   code = PAPI_NATIVE_MASK | PAPI_COMPONENT_MASK(cid);
+-           PAPI_enum_event( &code, PAPI_ENUM_FIRST );
+ 
+-	   while ( PAPI_enum_event( &code, PAPI_ENUM_EVENTS ) == PAPI_OK ) {
+           r = PAPI_enum_event( &code, PAPI_ENUM_FIRST );
+
+	   while ( r == PAPI_OK ) {
+ 	      retval = PAPI_event_code_to_name( code, event_name );
+ 	      if ( retval != PAPI_OK ) {
+		 printf("Error translating %x\n",code);
+ 	         test_fail( __FILE__, __LINE__, 
+                             "PAPI_event_code_to_name", retval );
+ 	      }
+@@ -101,6 +109,7 @@ int main (int argc, char **argv)
+ 
+ 	         total_events++;
+ 	      }
+	      r = PAPI_enum_event( &code, PAPI_ENUM_EVENTS );
+ 	   }
+         }
+ 
+diff -up papi-4.2.0/src/components/coretemp/tests/Makefile.orig papi-4.2.0/src/components/coretemp/tests/Makefile
+--- papi-4.2.0/src/components/coretemp/tests/Makefile.orig	2011-10-31 11:15:01.175663133 -0400
+++ papi-4.2.0/src/components/coretemp/tests/Makefile	2011-10-31 11:15:40.621532177 -0400
+@@ -5,9 +5,9 @@ include ../../Makefile_comp_tests
+ 
+ TESTS = coretemp_basic
+ 
+-example_tests: $(TESTS)
+coretemp_tests: $(TESTS)
+ 
+-coretemp_basic: coretemp_basic.o
+coretemp_basic: coretemp_basic.o $(UTILOBJS) $(PAPILIB)
+ 	$(CC) $(CFLAGS) $(INCLUDE) -o coretemp_basic coretemp_basic.o $(UTILOBJS) $(PAPILIB) $(LDFLAGS) 
+ 
+ 
--- a/papi-ldflags.patch
+++ b/papi-ldflags.patch
@ -1,115 +0,0 @@
-commit bde3da26f1f2755689e16fc9f5ab404367d1fdc8
-Author: Vince Weaver <vincent.weaver@maine.edu>
-Date:   Wed Jan 24 14:13:28 2018 -0500
-
-    build: fix various LDFLAGS/CFLAGS issues
-    
-    issues were reported by Andreas Beckmann <anbe@debian.org>
-
-diff --git a/src/components/Makefile_comp_tests.target.in b/src/components/Makefile_comp_tests.target.in
-index 9a369adb..a4412bea 100644
--- a/src/components/Makefile_comp_tests.target.in
-+++ b/src/components/Makefile_comp_tests.target.in
-@@ -9,7 +9,7 @@ INCLUDE = -I. -I@includedir@ -I$(datadir) -I$(testlibdir) -I$(validationlibdir)
- LIBDIR  = @libdir@
- PAPILIB = $(datadir)/@LIBRARY@
- TESTLIB = $(testlibdir)/libtestlib.a
-LDFLAGS = @LDL@
-+LDFLAGS = @LDFLAGS@ @LDL@
- CC	= @CC@
- F77	= @F77@
- CC_R	= @CC_R@
-diff --git a/src/components/perf_event_uncore/tests/Makefile b/src/components/perf_event_uncore/tests/Makefile
-index 3ee8fc2a..d70debe6 100644
--- a/src/components/perf_event_uncore/tests/Makefile
-+++ b/src/components/perf_event_uncore/tests/Makefile
-@@ -17,19 +17,19 @@ perf_event_uncore_lib.o:	perf_event_uncore_lib.c perf_event_uncore_lib.h
- 
- 
- perf_event_amd_northbridge:	perf_event_amd_northbridge.o $(DOLOOPS) $(UTILOBJS) $(PAPILIB) $(DOLOOPS)
-	$(CC) $(LFLAGS) -o perf_event_amd_northbridge perf_event_amd_northbridge.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
-+	$(CC) $(CFLAGS) -o perf_event_amd_northbridge perf_event_amd_northbridge.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
- 
- perf_event_uncore:	perf_event_uncore.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) perf_event_uncore_lib.o
-	$(CC) $(LFLAGS) -o perf_event_uncore perf_event_uncore.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
-+	$(CC) $(CFLAGS) -o perf_event_uncore perf_event_uncore.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
- 
- perf_event_uncore_attach:	perf_event_uncore_attach.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) perf_event_uncore_lib.o
-	$(CC) $(LFLAGS) -o perf_event_uncore_attach perf_event_uncore_attach.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
-+	$(CC) $(CFLAGS) -o perf_event_uncore_attach perf_event_uncore_attach.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
- 
- perf_event_uncore_multiple:	perf_event_uncore_multiple.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB)
-	$(CC) $(LFLAGS) $(INCLUDE) -o perf_event_uncore_multiple perf_event_uncore_multiple.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) 
-+	$(CC) $(CFLAGS) $(INCLUDE) -o perf_event_uncore_multiple perf_event_uncore_multiple.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) 
- 
- perf_event_uncore_cbox:	perf_event_uncore_cbox.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB)
-	$(CC) $(LFLAGS) $(INCLUDE) -o perf_event_uncore_cbox perf_event_uncore_cbox.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
-+	$(CC) $(CFLAGS) $(INCLUDE) -o perf_event_uncore_cbox perf_event_uncore_cbox.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
- 
- 
- 
-diff --git a/src/ctests/Makefile.recipies b/src/ctests/Makefile.recipies
-index 63c107c0..201f3c85 100644
--- a/src/ctests/Makefile.recipies
-+++ b/src/ctests/Makefile.recipies
-@@ -350,7 +350,7 @@ code2name: code2name.c $(TESTLIB) $(PAPILIB)
- 	$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) code2name.c $(TESTLIB) $(PAPILIB) $(LDFLAGS) -o code2name
- 
- attach_target: attach_target.c $(DOLOOPS)
-	-$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) attach_target.c -o attach_target $(DOLOOPS) $(TESTLIB)
-+	-$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) attach_target.c -o attach_target $(DOLOOPS) $(TESTLIB) $(LDFLAGS)
- 
- zero_attach: zero_attach.c $(TESTLIB) $(DOLOOPS) $(PAPILIB)
- 	-$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) zero_attach.c $(TESTLIB) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) -o zero_attach
-diff --git a/src/ctests/Makefile.target.in b/src/ctests/Makefile.target.in
-index bb51c350..fcc3373b 100644
--- a/src/ctests/Makefile.target.in
-+++ b/src/ctests/Makefile.target.in
-@@ -12,7 +12,7 @@ LIBRARY=@LIBRARY@
- SHLIB=@SHLIB@
- PAPILIB = ../@LINKLIB@
- TESTLIB = $(testlibdir)/libtestlib.a
-LDFLAGS = @LDL@ @STATIC@
-+LDFLAGS = @LDFLAGS@ @LDL@ @STATIC@
- CC	= @CC@
- MPICC	= @MPICC@
- F77	= @F77@
-diff --git a/src/ftests/Makefile.target.in b/src/ftests/Makefile.target.in
-index 718586e5..8006dd8d 100644
--- a/src/ftests/Makefile.target.in
-+++ b/src/ftests/Makefile.target.in
-@@ -11,7 +11,7 @@ LIBRARY = @LIBRARY@
- SHLIB=@SHLIB@
- PAPILIB = ../@LINKLIB@
- TESTLIB = $(testlibdir)/libtestlib.a
-LDFLAGS = @LDL@
-+LDFLAGS = @LDFLAGS@ @LDL@
- CC	= @CC@
- F77	= @F77@
- CC_R	= @CC_R@
-diff --git a/src/utils/Makefile.target.in b/src/utils/Makefile.target.in
-index a5eab438..58d438a1 100644
--- a/src/utils/Makefile.target.in
-+++ b/src/utils/Makefile.target.in
-@@ -11,7 +11,7 @@ LIBRARY=@LIBRARY@
- SHLIB=@SHLIB@
- PAPILIB = ../@LINKLIB@
- TESTLIB = $(testlibdir)/libtestlib.a
-LDFLAGS = @LDL@ @STATIC@
-+LDFLAGS = @LDFLAGS@ @LDL@ @STATIC@
- CC	= @CC@
- MPICC	= @MPICC@
- F77	= @F77@
-diff --git a/src/validation_tests/Makefile.target.in b/src/validation_tests/Makefile.target.in
-index a5eab438..58d438a1 100644
--- a/src/validation_tests/Makefile.target.in
-+++ b/src/validation_tests/Makefile.target.in
-@@ -11,7 +11,7 @@ LIBRARY=@LIBRARY@
- SHLIB=@SHLIB@
- PAPILIB = ../@LINKLIB@
- TESTLIB = $(testlibdir)/libtestlib.a
-LDFLAGS = @LDL@ @STATIC@
-+LDFLAGS = @LDFLAGS@ @LDL@ @STATIC@
- CC	= @CC@
- MPICC	= @MPICC@
- F77	= @F77@
--- a/papi.spec
+++ b/papi.spec
@ -1,39 +1,21 @@
-%bcond_with bundled_libpfm
-# rdma is not available
-%ifarch %{arm}
-%{!?with_rdma: %global with_rdma 0}
-%else
-%{!?with_rdma: %global with_rdma 1}
-%endif
 Summary: Performance Application Programming Interface
 Name: papi
-Version: 5.6.0
-Release: 6%{?dist}
+Version: 4.2.0
+Release: 4%{?dist}
 License: BSD
 Group: Development/System
-Requires: papi-libs = %{version}-%{release}
 URL: http://icl.cs.utk.edu/papi/
 Source0: http://icl.cs.utk.edu/projects/papi/downloads/%{name}-%{version}.tar.gz
-Patch1: papi-ldflags.patch
-BuildRequires: autoconf
-BuildRequires: doxygen
+Patch1: papi-coretemp.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ncurses-devel
 BuildRequires: gcc-gfortran
 BuildRequires: kernel-headers >= 2.6.32
 BuildRequires: chrpath
-BuildRequires: lm_sensors-devel
-%if %{without bundled_libpfm}
-BuildRequires: libpfm-devel >= 4.6.0-1
-BuildRequires: libpfm-static >= 4.6.0-1
-%endif
 # Following required for net component
 BuildRequires: net-tools
-%if  %{with_rdma}
 # Following required for inifiband component
-BuildRequires: rdma-core-devel
-BuildRequires: infiniband-diags-devel
-%endif
-BuildRequires: perl-generators
+BuildRequires: libibmad-devel 
 #Right now libpfm does not know anything about s390 and will fail
 ExcludeArch: s390 s390x

@ -41,299 +23,84 @@ ExcludeArch: s390 s390x
 PAPI provides a programmer interface to monitor the performance of
 running programs.

-%package libs
-Summary: Libraries for PAPI clients
-Group: Development/System
-%description libs
-This package contains the run-time libraries for any application that wishes
-to use PAPI.
-
 %package devel
 Summary: Header files for the compiling programs with PAPI
 Group: Development/System
 Requires: papi = %{version}-%{release}
-Requires: pkgconfig
 %description devel
-PAPI-devel includes the C header files that specify the PAPI user-space
+PAPI-devel includes the C header files that specify the PAPI userspace
 libraries and interfaces. This is required for rebuilding any program
 that uses PAPI.

-%package testsuite
-Summary: Set of tests for checking PAPI functionality
-Group: Development/System
-Requires: papi = %{version}-%{release}
-%description testsuite
-PAPI-testuiste includes compiled versions of papi tests to ensure
-that PAPI functions on particular hardware.
-
 %package static
 Summary: Static libraries for the compiling programs with PAPI
 Group: Development/System
 Requires: papi = %{version}-%{release}
 %description static
 PAPI-static includes the static versions of the library files for
-the PAPI user-space libraries and interfaces.
+the PAPI userspace libraries and interfaces.

 %prep
 %setup -q
-%patch1 -p1 -b .ldflags
+%patch1 -p1 -b .temp

 %build
-%if %{without bundled_libpfm}
-# Build our own copy of libpfm.
-%global libpfm_config --with-pfm-incdir=%{_includedir} --with-pfm-libdir=%{_libdir}
-%endif
-
 cd src
-autoconf
-%configure --with-perf-events \
-%{?libpfm_config} \
--with-static-lib=yes --with-shared-lib=yes --with-shlib --with-shlib-tools \
--with-components="appio coretemp example infiniband lmsensors lustre micpower mx net rapl stealtime"
-# implicit enabled components: perf_event perf_event_uncore
+%configure --with-libpfm4 \
+--with-static-lib=yes --with-shared-lib=yes --with-shlib \
+--with-components="acpi coretemp example net"
 #components currently left out because of build configure/build issues
-# --with-components="bgpm coretemp_freebsd cuda host_micpower nvml vmware"
+#--with-components="cuda infiniband lmsensors lustre mx"

 pushd components
 #pushd cuda; ./configure; popd
-#pushd host_micpower; ./configure; popd
-%if  %{with_rdma}
-pushd infiniband_umad; %configure; popd
-%endif
-pushd lmsensors; \
- %configure --with-sensors_incdir=/usr/include/sensors \
- --with-sensors_libdir=%{_libdir}; \
- popd
-#pushd vmware; ./configure; popd
+pushd infiniband; ./configure; popd
+#pushd lmsensors; ./configure; popd
+#pushd mx; ./configure ; popd
+pushd net; ./configure; popd
 popd

 #DBG workaround to make sure libpfm just uses the normal CFLAGS
-DBG="" make %{?_smp_mflags}
-
-#generate updated versions of the documentation
-#DBG workaround to make sure libpfm just uses the normal CFLAGS
-pushd ../doc
 DBG="" make
-DBG="" make install
-popd
+
+#%check
+#cd src
+#make fulltest

 %install
 rm -rf $RPM_BUILD_ROOT
 cd src
-make DESTDIR=$RPM_BUILD_ROOT LDCONFIG=/bin/true install-all
+make DESTDIR=$RPM_BUILD_ROOT install

 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so*
+#hack to get rid of unwanted man1/
+rm $RPM_BUILD_ROOT/%{_mandir}/man1/*.c.1
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+%clean
+rm -rf $RPM_BUILD_ROOT

 %files
+%defattr(-,root,root,-)
 %{_bindir}/*
-%dir /usr/share/papi
-/usr/share/papi/papi_events.csv
+%{_libdir}/*.so.*
+/usr/share/papi
 %doc INSTALL.txt README LICENSE.txt RELEASENOTES.txt
 %doc %{_mandir}/man1/*

-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-%files libs
-%{_libdir}/*.so.*
-%doc INSTALL.txt README LICENSE.txt RELEASENOTES.txt
-
 %files devel
+%defattr(-,root,root,-)
 %{_includedir}/*.h
-%if %{with bundled_libpfm}
 %{_includedir}/perfmon/*.h
-%endif
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/papi*.pc
 %doc %{_mandir}/man3/*

-%files testsuite
-/usr/share/papi/run_tests*
-/usr/share/papi/ctests
-/usr/share/papi/ftests
-/usr/share/papi/validation_tests
-/usr/share/papi/components
-/usr/share/papi/testlib
-
 %files static
+%defattr(-,root,root,-)
 %{_libdir}/*.a

 %changelog
-* Thu May 17 2018 William Cohen <wcohen@redhat.com> - 5.6.0-6
- Dynamically link utilities and tests to papi libraries.
-
-* Mon Apr 30 2018 William Cohen <wcohen@redhat.com> - 5.6.0-5
- Include various LDFLAGS/CFLAGS.
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jan 31 2018 William Cohen <wcohen@redhat.com> - 5.6.0-3
- Bump and rebuild.
-
-* Thu Dec 21 2017 William Cohen <wcohen@redhat.com> - 5.6.0-2
- Correct infiniband buildrequires.
-
-* Thu Dec 21 2017 William Cohen <wcohen@redhat.com> - 5.6.0-1
- Rebase to papi-5.6.0.
-
-* Mon Aug 28 2017 Honggang LI <honli@redhat.com> - 5.5.1-6
- Disable RDMA support on ARM32
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Feb 2 2017 William Cohen <wcohen@redhat.com> - 5.5.1-2
- Bump version and rebuild due to new libgfortan.so version.
-
-* Fri Nov 18 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.1-1
- Rebase to papi-5.5.1.
-
-* Wed Sep 14 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.0-1
- Rebase to papi-5.5.0.
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Jan 26 2016 William Cohen <wcohen@redhat.com> - 5.4.3-1
- Rebase to papi-5.4.3.
-
-* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Mar 6 2015 William Cohen <wcohen@redhat.com> - 5.4.1-2
- Make sure using libpfm-4.6.0.
-
-* Tue Mar 3 2015 William Cohen <wcohen@redhat.com> - 5.4.1-1
- Rebase to papi-5.4.1.
-
-* Wed Feb 11 2015 William Cohen <wcohen@redhat.com> - 5.4.0-3
- Bump version and rebuild.
-
-* Thu Dec 18 2014 William Cohen <wcohen@redhat.com> - 5.4.0-2
- Split out papi-libs as separate subpackage. (#1172875)
-
-* Mon Nov 17 2014 William Cohen <wcohen@redhat.com> - 5.4.0-1
- Rebase to papi-5.4.0.
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Mon Aug 4 2014 William Cohen <wcohen@redhat.com> - 5.3.2-1
- Rebase to 5.3.2.
-
-* Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3.0-2.16.ga7f6159
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri Jan 17 2014 Lukas Berk <lberk@redhat.com> - 5.3.0-1.16.ga7f6159
- Automated weekly rawhide release
-
-* Thu Jan 16 2014 William Cohen <wcohen@redhat.com> - 5.3.0-1
- Rebase to 5.3.0.
-
-* Tue Jan 14 2014 William Cohen <wcohen@redhat.com> - 5.2.0-5
- Add presets for Intel Silvermont.
-
-* Mon Jan 13 2014 William Cohen <wcohen@redhat.com> - 5.2.0-4
- Add presets for Haswell and Ivy Bridge.
-
-* Wed Aug 14 2013 William Cohen <wcohen@redhat.com> - 5.2.0-2
- Enable infiniband and stealtime components.
-
-* Wed Aug 07 2013 William Cohen <wcohen@redhat.com> - 5.2.0-1
- Rebase to 5.2.0
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Jul 24 2013 William Cohen <wcohen@redhat.com> - 5.1.1-7
- rhbz830275 - Add support for POWER8 processor to PAPI
-
-* Mon Jul 22 2013 William Cohen <wcohen@redhat.com> - 5.1.1-6
- Add autoconf buildrequires.
-
-* Mon Jul 22 2013 William Cohen <wcohen@redhat.com> - 5.1.1-5
- rhbz986673 - /usr/lib64/libpapi.so is unowned
- Package files in /usr/share/papi only once.
- Avoid dependency problem with parallel make of man pages.
-
-* Fri Jul 19 2013 William Cohen <wcohen@redhat.com> - 5.1.1-4
- Correct changelog.
-
-* Fri Jul 5 2013 William Cohen <wcohen@redhat.com> - 5.1.1-3
- Add man page corrections/updates.
-
-* Fri Jun 28 2013 William Cohen <wcohen@redhat.com> - 5.1.1-2
- Add testsuite subpackage.
-
-* 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.
-
-* Tue Apr 9 2013 William Cohen <wcohen@redhat.com> - 5.1.0.2-1
- Rebase to 5.1.0.2
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.0.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Mon Jan 14 2013 William Cohen <wcohen@redhat.com> - 5.0.1-5
- Add armv7 cortex a15 presets.
-
-* Tue Dec 04 2012 William Cohen <wcohen@redhat.com> - 5.0.1-4
- Disable ldconfig on install.
-
-* Thu Nov 08 2012 William Cohen <wcohen@redhat.com> - 5.0.1-3
- Avoid duplicated shared library.
-
-* Wed Oct 03 2012 William Cohen <wcohen@redhat.com> - 5.0.1-2
- Make sure using compatible version of libpfm.
-
-* Thu Sep 20 2012 William Cohen <wcohen@redhat.com> - 5.0.1-1
- Rebase to 5.0.1.
-
-* Mon Sep 10 2012 William Cohen <wcohen@redhat.com> - 5.0.0-6
- Back port fixes for Intel Ivy Bridge event presets.
-
-* Thu Aug 30 2012 William Cohen <wcohen@redhat.com> - 5.0.0-5
- Fixes to make papi with unbundled libpfm.
-
-* Mon Aug 27 2012 William Cohen <wcohen@redhat.com> - 5.0.0-2
- Keep libpfm unbundled.
-
-* 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
-
-* Mon Jun 11 2012 William Cohen <wcohen@redhat.com> - 4.4.0-4
- Use siginfo_t rather than struct siginfo.
-
-* Mon Jun 11 2012 William Cohen <wcohen@redhat.com> - 4.4.0-3
- Correct build requires.
-
-* Mon Jun 11 2012 William Cohen <wcohen@redhat.com> - 4.4.0-2
- Unbundle libpfm4 from papi.
- Correct description spellings.
- Remove unused test section.
-
-* Fri Apr 20 2012 William Cohen <wcohen@redhat.com> - 4.4.0-1
- Rebase to 4.4.0.
-
-* Fri Mar 9 2012 William Cohen <wcohen@redhat.com> - 4.2.1-2
- Fix overrun in lmsensor component. (rhbz797692)
-
-* Tue Feb 14 2012 William Cohen <wcohen@redhat.com> - 4.2.1-1
- Rebase to 4.2.1.
-
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

@ -365,7 +132,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so*
 * Fri Oct 1 2010 William Cohen <wcohen@redhat.com> - 4.1.1-1
 - Rebase to papi-4.1.1

-* Tue Jun 22 2010 William Cohen <wcohen@redhat.com> - 4.1.0-1
+* Mon Jun 8 2010 William Cohen <wcohen@redhat.com> - 4.1.0-1
 - Rebase to papi-4.1.0

 * Mon May 17 2010 William Cohen <wcohen@redhat.com> - 4.0.0-5
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (papi-5.6.0.tar.gz) = b2a1536f220081d08ee9bc94fddbf422e36c60c55b0536bc43dec074bdaf23afaedbdd755b7e6af25c4c0ce582cc7ad4c59e2adc1801e75c482d472b080439be
+ca5f85fd2474c11bc847a6c784ca2668  papi-4.2.0.tar.gz