From 020c8f1f1effb33c1dac57f96df48f9f7d513ef9 Mon Sep 17 00:00:00 2001
From: William Eden Cohen <wcohen@fedoraproject.org>
Date: Feb 26 2008 02:49:52 +0000
Subject: - Update to libpfm-3.3.


---

diff --git a/.cvsignore b/.cvsignore
index 7f9dc46..073c51e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libpfm-3.2-071017.tar.gz
+libpfm-3.3.tar.gz
diff --git a/libpfm-3.2-man3.patch b/libpfm-3.2-man3.patch
deleted file mode 100644
index e445cdd..0000000
--- a/libpfm-3.2-man3.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libpfm-3.2-060926/docs/Makefile.prefix	2006-09-26 08:21:35.000000000 -0400
-+++ libpfm-3.2-060926/docs/Makefile	2006-10-01 23:04:14.000000000 -0400
-@@ -28,5 +28,5 @@
- .PHONY: all clean distclean depend
- 
- install:
--	-mkdir -p $(DESTDIR)$(MANDIR)
--	( cd man3; $(INSTALL) -m 644 *.3 $(DESTDIR)$(MANDIR) )
-+	-mkdir -p $(DESTDIR)$(MANDIR)/man3
-+	( cd man3; $(INSTALL) -m 644 *.3 $(DESTDIR)$(MANDIR)/man3 )
diff --git a/libpfm-3.2-showreginfo.patch b/libpfm-3.2-showreginfo.patch
deleted file mode 100644
index c273a97..0000000
--- a/libpfm-3.2-showreginfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libpfm-3.2-060621/examples/showreginfo.c.fread	2006-06-26 23:21:03.000000000 -0400
-+++ libpfm-3.2-060621/examples/showreginfo.c	2006-06-26 23:21:35.000000000 -0400
-@@ -65,7 +65,7 @@
- 	unsigned int num_pmds;
- 	char *lname, *p, *s, *buffer, *ptr;
- 	unsigned long long def, reset;
--	size_t pgsz;
-+	size_t pgsz, elements;
- 
- 	num_pmcs = num_pmds = 0;
- 
-@@ -81,7 +81,7 @@
- 	/*
- 	 * sysfs file cannot exceed the size of a page.
- 	 */
--	fread(buffer, pgsz, 1, fp);
-+	elements=fread(buffer, pgsz, 1, fp);
- 
- 	fclose(fp);
- 
diff --git a/libpfm-compat.patch b/libpfm-compat.patch
deleted file mode 100644
index f07d34c..0000000
--- a/libpfm-compat.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libpfm-3.2-060421/include/Makefile.orig	2006-05-05 10:31:38.000000000 -0400
-+++ libpfm-3.2-060421/include/Makefile	2006-05-05 10:32:19.000000000 -0400
-@@ -34,6 +34,7 @@
- ifeq ($(CONFIG_PFMLIB_ARCH_IA64),y)
- HEADERS += perfmon/pfmlib_os_ia64.h       \
- 	   perfmon/pfmlib_comp_ia64.h     \
-+	   perfmon/perfmon_compat.h       \
- 	   perfmon/perfmon_ia64.h         \
- 	   perfmon/perfmon_default_smpl.h
- endif
diff --git a/libpfm.spec b/libpfm.spec
index 0f598b5..99c4ad9 100644
--- a/libpfm.spec
+++ b/libpfm.spec
@@ -1,15 +1,15 @@
-%define DATE 071017
+%define DATE 080225
 %define libpfm_release 1
 Summary: A performance monitoring library for Linux/ia64
 Name: libpfm
-Version: 3.2
-Release: 1.%{DATE}.%{libpfm_release}%{?dist}
+Version: 3.3
+Release: 0.%{DATE}.%{libpfm_release}%{?dist}
 License: MIT-style
 Group: Development/Libraries
 ExclusiveArch: ia64 %{ix86} x86_64
 ExclusiveOS: linux
 AutoReqProv: no
-Source: http://prdownloads.sourceforge.net/perfmon2/%{name}-%{version}-%{DATE}.tar.gz
+Source: http://prdownloads.sourceforge.net/perfmon2/%{name}-%{version}.tar.gz
 URL: http://sourceforge.net/projects/perfmon2/
 
 Patch3: libpfm-3.2-rpm_opt.patch
@@ -37,7 +37,7 @@ It requires a kernel perfmon-2.x subsystem.
 Requires: ncurses
 
 %prep
-%setup -q -n %{name}-%{version}-%{DATE}
+%setup -q -n %{name}-%{version}
 %patch3 -p1 -b .rpm_opt
 #%patch4 -p1 -b .man3
 
@@ -57,10 +57,8 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %doc README
-%attr(755,root,root) %{_libdir}/libpfm.so.%{PACKAGE_VERSION}.0
-%{_libdir}/libpfm.so
-%{_libdir}/libpfm.so.3
-
+%attr(755,root,root) %{_libdir}/*.so*
+%{_libdir}/*.so*
 
 %files devel
 %defattr(-,root,root)
@@ -70,6 +68,9 @@ rm -rf %{buildroot}
 %{_prefix}/include/*
 
 %changelog
+* Mon Feb 25 2008 Will Cohen <wcohen@redhat.com> - 3.3-0.080225.1
+- Update to libpfm-3.3.
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 3.2-1.071017.1
 - Autorebuild for GCC 4.3
 
@@ -89,7 +90,7 @@ rm -rf %{buildroot}
 - Add dist tag to build.
 
 * Sun Oct 1 2006 Will Cohen <wcohen@redhat.com> - 3.2-0.060926.2
-- Eliminate unneeded libpfm-compat.patch.
+- Eliminate unneeded libpfm-compa.tpatch.
 
 * Sun Oct 1 2006 Will Cohen <wcohen@redhat.com> - 3.2-0.060926.1
 - Update to libpfm-3.2-060926.
diff --git a/sources b/sources
index 3774d62..9f1c917 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-879862ede030f7155666941c3930a45b  libpfm-3.2-071017.tar.gz
+3adb81688dd908f1482cec77d04a73ab  libpfm-3.3.tar.gz