rpms/oprofile/F-11 .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 oprofile.spec, 1.79, 1.80 oprofile-basename.patch, 1.1, NONE oprofile-iaperf.patch, 1.1, NONE oprofile-verbose.patch, 1.1, NONE

[William Eden Cohen]

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5124

Modified Files:
	.cvsignore sources oprofile.spec 
Removed Files:
	oprofile-basename.patch oprofile-iaperf.patch 
	oprofile-verbose.patch 
Log Message:
Import oprofile 0.9.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	18 Jul 2008 19:45:30 -0000	1.14
+++ .cvsignore	4 Sep 2009 15:17:26 -0000	1.15
@@ -1 +1 @@
-oprofile-0.9.4.tar.gz
+oprofile-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	18 Jul 2008 19:45:30 -0000	1.15
+++ sources	4 Sep 2009 15:17:26 -0000	1.16
@@ -1 +1 @@
-82b059379895cf125261d7d773465915  oprofile-0.9.4.tar.gz
+4b2ceca3fa013c95cc8d47c790807dc2  oprofile-0.9.5.tar.gz


Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-11/oprofile.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- oprofile.spec	16 Jul 2009 18:58:20 -0000	1.79
+++ oprofile.spec	4 Sep 2009 15:17:26 -0000	1.80
@@ -1,9 +1,7 @@
-%define DATE 20070717
-%define oprofile_version 0.9.4
 Summary: System wide profiler
 Name: oprofile
-Version: 0.9.4
-Release: 12%{?dist}
+Version: 0.9.5
+Release: 1%{?dist}
 License: GPLv2
 Group: Development/System
 #
@@ -14,11 +12,7 @@ Requires(pre): shadow-utils
 Patch10: oprofile-0.4-guess2.patch
 Patch63: oprofile-0.7-libs.patch
 Patch83: oprofile-0.9.3-xen.patch
-#Patch100: oprofile-gcc43.patch
-Patch101: oprofile-basename.patch
-Patch102: oprofile-iaperf.patch
-Patch103: oprofile-verbose.patch
-Patch104: oprofile-jvmpi-lgpl.patch
+#Patch104: oprofile-jvmpi-lgpl.patch
 
 URL: http://oprofile.sf.net
 
@@ -85,12 +79,8 @@ agent library.
 %patch10 -p1 -b .guess2
 #%patch35 -p1 -b .separate
 %patch63 -p1 -b .libs
-%patch83 -p1 -b .xen
-#%patch100 -p1 -b .gcc43
-%patch101 -p1 -b .basename
-%patch102 -p1 -b .iaperf
-%patch103 -p1 -b .verbose
-%patch104 -p1 -b .lgpl
+#%patch83 -p1 -b .xen
+#%patch104 -p1 -b .lgpl
 
 ./autogen.sh
 
@@ -133,9 +123,12 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man
 
 make DESTDIR=${RPM_BUILD_ROOT} install
 
-#the following is an ugly hack
-rm -rf ${RPM_BUILD_ROOT}/usr/share/doc/oprofile
-rm -rf ${RPM_BUILD_ROOT}/usr/share/mangled-name
+# We want the manuals in the special doc dir, not the generic doc install dir.
+# We build it in place and then move it away so it doesn't get installed
+# twice. rpm can specify itself where the (versioned) docs go with the
+# %doc directive.
+mkdir docs.installed
+mv $RPM_BUILD_ROOT%{_datadir}/doc/oprofile/* docs.installed/
 
 #hack to make header files available
 mkdir -p ${RPM_BUILD_ROOT}%{_includedir}
@@ -172,7 +165,8 @@ exit 0
 
 %files
 %defattr(-,root,root)
-%doc doc/oprofile.html
+%doc  docs.installed/*
+%doc COPYING
 
 %{_bindir}/ophelp
 %{_bindir}/opimport
@@ -213,9 +207,6 @@ exit 0
 %{_libdir}/liboputil++.a
 %{_libdir}/liboputil.a
 
-%doc doc/op-jit-devel.html
-%doc doc/opreport.xsd
-
 %files gui
 %defattr(-,root,root)
 
@@ -232,6 +223,9 @@ exit 0
 /etc/ld.so.conf.d/*
 
 %changelog
+* Fri Sep 4 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-1
+- Rebase on OProfile 0.9.5.
+
 * Thu Jul 16 2009 Will Cohen <wcohen at redhat.com> - 0.9.4-12
 - Add shadow-utils to requires. Resolves: rhbz #501357
 - Add LGPL license to provided java support. Resolves: rhbz #474666


--- oprofile-basename.patch DELETED ---


--- oprofile-iaperf.patch DELETED ---


--- oprofile-verbose.patch DELETED ---