From a185a25c9bd6d4814cd997c5e9d67917d5599f9e Mon Sep 17 00:00:00 2001
From: William Eden Cohen <wcohen@fedoraproject.org>
Date: Jul 31 2008 21:25:36 +0000
Subject: - Update to libpfm-3.5.


---

diff --git a/.cvsignore b/.cvsignore
index e00db5f..40f853d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libpfm-3.4.tar.gz
+libpfm-3.5.tar.gz
diff --git a/libpfm-3.4-unused.patch b/libpfm-3.4-unused.patch
index 397550e..3bf1ae8 100644
--- a/libpfm-3.4-unused.patch
+++ b/libpfm-3.4-unused.patch
@@ -1,22 +1,38 @@
-diff -up libpfm-3.4/examples/self_pipe.c.unused libpfm-3.4/examples/self_pipe.c
---- libpfm-3.4/examples/self_pipe.c.unused	2008-05-02 09:49:25.000000000 -0400
-+++ libpfm-3.4/examples/self_pipe.c	2008-05-02 09:49:40.000000000 -0400
-@@ -125,6 +125,7 @@ main(int argc, char **argv)
- 	size_t len;
- 	char *name;
- 	char c = '0';
+diff -up libpfm-3.5/examples/multiplex.c.unused libpfm-3.5/examples/multiplex.c
+--- libpfm-3.5/examples/multiplex.c.unused	2008-07-31 16:58:21.000000000 -0400
++++ libpfm-3.5/examples/multiplex.c	2008-07-31 16:59:18.000000000 -0400
+@@ -613,6 +613,7 @@ measure_one_cpu(char **argv)
+ 	struct pollfd pollfd;
+ 	pid_t pid = 0;
+ 	int ret, timeout;
 +	int nbytes;
  
- 	/*
- 	 * pass options to library (optional)
-@@ -312,8 +313,8 @@ main(int argc, char **argv)
- 	 * ping pong loop
- 	 */
- 	while(!quit) {
--		write(pr[1], "c", 1);
--		read(pw[0], &c, 1);	
-+		nbytes = write(pr[1], "c", 1);
-+		nbytes = read(pw[0], &c, 1);	
- 	}
+ 	memset(ctx, 0, sizeof(ctx));
+ 	memset(&load_arg, 0, sizeof(load_arg));
+@@ -721,7 +722,7 @@ measure_one_cpu(char **argv)
+ 				 */
+ 				if (options.opt_ovfl_switch) {
+ 					pfarg_msg_t msg;
+-					read(ctxid, &msg, sizeof(msg));
++					nbytes = read(ctxid, &msg, sizeof(msg));
+ 				}
+ 				switch_sets(ctxid);
+ 				break;
+diff -up libpfm-3.5/lib/pfmlib_os_linux.c.unused libpfm-3.5/lib/pfmlib_os_linux.c
+--- libpfm-3.5/lib/pfmlib_os_linux.c.unused	2008-07-30 17:16:40.000000000 -0400
++++ libpfm-3.5/lib/pfmlib_os_linux.c	2008-07-31 16:57:05.000000000 -0400
+@@ -390,12 +390,13 @@ static int
+ pfm_init_syscalls_sysfs(void)
+ {
+ 	FILE *fp;
++	int nbytes;
+ 
+ 	fp = fopen("/sys/kernel/perfmon/syscall", "r");
+ 	if (!fp)
+ 		return -1;
+ 
+-	fscanf(fp, "%d", &sys_base);
++	nbytes = fscanf(fp, "%d", &sys_base);
+ 
+ 	fclose(fp);
  
- 	if (pfm_stop(ctx_fd))
diff --git a/libpfm.spec b/libpfm.spec
index 26ef3ce..9471f8d 100644
--- a/libpfm.spec
+++ b/libpfm.spec
@@ -1,12 +1,12 @@
-%define DATE 080502
+%define DATE 080731
 %define libpfm_release 1
 Summary: A performance monitoring library for Linux/ia64
 Name: libpfm
-Version: 3.4
+Version: 3.5
 Release: %{libpfm_release}%{?dist}
 License: MIT-style
 Group: Development/Libraries
-ExclusiveArch: ia64 %{ix86} x86_64
+ExclusiveArch: ia64 %{ix86} x86_64 ppc ppc64
 ExclusiveOS: linux
 AutoReqProv: no
 Source: http://prdownloads.sourceforge.net/perfmon2/%{name}-%{version}.tar.gz
@@ -72,6 +72,9 @@ rm -rf %{buildroot}
 %{_prefix}/include/*
 
 %changelog
+* Thu Jul 31 2008 Will Cohen <wcohen@redhat.com> - 3.5-1
+- Update to libpfm-3.5.
+
 * Fri May 2 2008 Will Cohen <wcohen@redhat.com> - 3.4-1
 - Update to libpfm-3.4.
 
diff --git a/sources b/sources
index 1b93583..4992fd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e0b1a02027e9e251ee9ad5bccc6c313a  libpfm-3.4.tar.gz
+01caa64e409d378bd420aca9d3bc6efb  libpfm-3.5.tar.gz