Update to libpfm-3.2-060926.tar.gz

.cvsignore

@@ -1 +1 @@
-libpfm-3.2-060621.tar.gz
+libpfm-3.2-060926.tar.gz

libpfm-3.2-man3.patch

@@ -0,0 +1,10 @@
+--- 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 )

libpfm-3.2-rpm_opt.patch

@@ -1,20 +1,20 @@
---- libpfm-3.2-060621/rules.mk.orig	2006-04-05 08:55:12.000000000 -0400
-+++ libpfm-3.2-060621/rules.mk	2006-06-27 00:19:08.000000000 -0400
+--- libpfm-3.2-060926/rules.mk.rpm_opt	2006-09-26 08:21:37.000000000 -0400
++++ libpfm-3.2-060926/rules.mk	2006-10-01 21:33:10.000000000 -0400
 @@ -25,12 +25,12 @@
  .SUFFIXES: .c .S .o .lo .cpp
  
  .S.o:
--	$(CC) $(INCDIR) $(CFLAGS) -c $*.S
-+	$(CC) $(INCDIR) $(CFLAGS) $(RPM_OPT_FLAGS) -c $*.S
+-	$(CC) $(CFLAGS) -c $*.S
++	$(CC) $(CFLAGS) $(RPM_OPT_FLAGS) -c $*.S
  .c.o:
--	$(CC) $(INCDIR) $(CFLAGS) -c $*.c
-+	$(CC) $(INCDIR) $(CFLAGS) $(RPM_OPT_FLAGS) -c $*.c
+-	$(CC) $(CFLAGS) -c $*.c
++	$(CC) $(CFLAGS) $(RPM_OPT_FLAGS) -c $*.c
  .cpp.o:
--	$(CXX) $(INCDIR) $(CFLAGS) -c $*.cpp
-+	$(CXX) $(INCDIR) $(CFLAGS) $(RPM_OPT_FLAGS) -c $*.cpp
+-	$(CXX) $(CFLAGS) -c $*.cpp
++	$(CXX) $(CFLAGS) $(RPM_OPT_FLAGS) -c $*.cpp
  .c.lo:
--	$(CC) -fPIC -DPIC $(INCDIR) $(CFLAGS) -c $*.c -o $*.lo
-+	$(CC) -fPIC -DPIC $(INCDIR) $(CFLAGS) $(RPM_OPT_FLAGS) -c $*.c -o $*.lo
+-	$(CC) -fPIC -DPIC $(CFLAGS) -c $*.c -o $*.lo
++	$(CC) -fPIC -DPIC $(CFLAGS) $(RPM_OPT_FLAGS) -c $*.c -o $*.lo
  .S.lo:
--	$(CC) -fPIC -DPIC $(INCDIR) $(CFLAGS) -c $*.S -o $*.lo
-+	$(CC) -fPIC -DPIC $(INCDIR) $(CFLAGS) $(RPM_OPT_FLAGS) -c $*.S -o $*.lo
+-	$(CC) -fPIC -DPIC $(CFLAGS) -c $*.S -o $*.lo
++	$(CC) -fPIC -DPIC $(CFLAGS) $(RPM_OPT_FLAGS) -c $*.S -o $*.lo

libpfm.spec

@@ -1,5 +1,5 @@
-%define DATE 060621
-%define libpfm_release 10
+%define DATE 060926
+%define libpfm_release 1
 Summary: a performance monitoring library for Linux/ia64
 Name: libpfm
 Version: 3.2
@@ -13,6 +13,7 @@ Source: http://prdownloads.sourceforge.net/perfmon2/%{name}-%{version}-%{DATE}.t
 Patch1: libpfm-compat.patch
 Patch2: libpfm-3.2-showreginfo.patch
 Patch3: libpfm-3.2-rpm_opt.patch
+Patch4: libpfm-3.2-man3.patch
 BuildPreReq: ncurses-devel
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -38,20 +39,17 @@ Requires: ncurses
 %prep
 %setup -q -n %{name}-%{version}-%{DATE}
 %patch1 -p1 -b .compat
-%patch2 -p1 -b .showreginfo
+#%patch2 -p1 -b .showreginfo
 %patch3 -p1 -b .rpm_opt
+%patch4 -p1 -b .man3
 
 %build
-make	DESTDIR=%{buildroot}/%{_prefix}
+make	PREFIX=/usr DESTDIR=%{buildroot} LIBDIR=%{_libdir}
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/%{_prefix}
-make install DESTDIR=%{buildroot}/%{_prefix}
-
-#hack to make put the libraries in the correct place
-mv ${RPM_BUILD_ROOT}/usr/lib ${RPM_BUILD_ROOT}/xyz
-mv ${RPM_BUILD_ROOT}/xyz ${RPM_BUILD_ROOT}%{_libdir}
+mkdir -p %{buildroot}
+make install  PREFIX=/usr DESTDIR=%{buildroot} LIBDIR=%{_libdir}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -72,6 +70,9 @@ rm -rf %{buildroot}
 %{_prefix}/include/*
 
 %changelog
+* Sun Oct 1 2006 Will Cohen <wcohen@redhat.com> - 3.2-0.060926.1
+- Update to libpfm-3.2-060926.
+
 * Tue Sep 19 2006 Will Cohen <wcohen@redhat.com> - 3.2-0.060621.10
 - Make sure fix works on i386. (#205221)
 

sources

@@ -1 +1 @@
-e311cd70ddcf8dd659169dda017a2954  libpfm-3.2-060621.tar.gz
+45017d25bff0bc65acf3d8f4632fc4b3  libpfm-3.2-060926.tar.gz