rpms/oprofile/devel .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 oprofile.spec, 1.80, 1.81 oprofile-0.7-libs.patch, 1.5, 1.6

Tue Aug 4 18:21:44 UTC 2009

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22996

Modified Files:
	.cvsignore sources oprofile.spec oprofile-0.7-libs.patch 
Log Message:
Rebase on OProfile 0.9.5.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/.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 Aug 2009 18:21:44 -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/devel/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 Aug 2009 18:21:44 -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/devel/oprofile.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- oprofile.spec	25 Jul 2009 20:57:22 -0000	1.80
+++ oprofile.spec	4 Aug 2009 18:21:44 -0000	1.81
@@ -1,9 +1,7 @@
-%define DATE 20070717
-%define oprofile_version 0.9.4
 Summary: System wide profiler
 Name: oprofile
-Version: 0.9.4
-Release: 13%{?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
+* Mon Aug 3 2009 Will Cohen <wcohen at redhat.com> - 0.9.5-1
+- Rebase on OProfile 0.9.5.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

oprofile-0.7-libs.patch:
 daemon/Makefile.am       |    4 ++--
 gui/Makefile.am          |    4 ++--
 libabi/Makefile.am       |   10 +++++-----
 libabi/tests/Makefile.am |    6 +++---
 libutil++/Makefile.am    |    4 ++--
 libutil/Makefile.am      |    4 ++--
 opjitconv/Makefile.am    |    2 +-
 pp/Makefile.am           |    4 ++--
 utils/Makefile.am        |    2 +-
 9 files changed, 20 insertions(+), 20 deletions(-)

Index: oprofile-0.7-libs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile-0.7-libs.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- oprofile-0.7-libs.patch	18 Jul 2008 19:45:30 -0000	1.5
+++ oprofile-0.7-libs.patch	4 Aug 2009 18:21:44 -0000	1.6
@@ -1,7 +1,7 @@
-diff -up oprofile-0.9.4rc1/daemon/Makefile.am.libs oprofile-0.9.4rc1/daemon/Makefile.am
---- oprofile-0.9.4rc1/daemon/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/daemon/Makefile.am	2008-06-01 13:41:19.000000000 -0400
-@@ -43,9 +43,9 @@ bin_PROGRAMS = oprofiled
+diff -up oprofile-0.9.5/daemon/Makefile.am.libs oprofile-0.9.5/daemon/Makefile.am
+--- oprofile-0.9.5/daemon/Makefile.am.libs	2009-07-31 13:10:19.000000000 -0400
++++ oprofile-0.9.5/daemon/Makefile.am	2009-08-04 14:01:40.000000000 -0400
+@@ -50,9 +50,9 @@ bin_PROGRAMS = oprofiled
  
  oprofiled_LDADD = \
  	liblegacy/liblegacy.a \
@@ -13,9 +13,9 @@ diff -up oprofile-0.9.4rc1/daemon/Makefi
 +	../libutil/liboputil.a
  
  oprofiled_LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-diff -up oprofile-0.9.4rc1/gui/Makefile.am.libs oprofile-0.9.4rc1/gui/Makefile.am
---- oprofile-0.9.4rc1/gui/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/gui/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/gui/Makefile.am.libs oprofile-0.9.5/gui/Makefile.am
+--- oprofile-0.9.5/gui/Makefile.am.libs	2009-07-31 13:10:18.000000000 -0400
++++ oprofile-0.9.5/gui/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -26,9 +26,9 @@ bin_PROGRAMS = oprof_start
  oprof_start_SOURCES = $(dist_sources)
  nodist_oprof_start_SOURCES = oprof_start.moc.cpp
@@ -28,9 +28,9 @@ diff -up oprofile-0.9.4rc1/gui/Makefile.
  	ui/liboprof_start.a \
  	@QT_LDFLAGS@ \
  	@QT_LIB@ \
-diff -up oprofile-0.9.4rc1/libabi/Makefile.am.libs oprofile-0.9.4rc1/libabi/Makefile.am
---- oprofile-0.9.4rc1/libabi/Makefile.am.libs	2008-05-21 14:52:32.000000000 -0400
-+++ oprofile-0.9.4rc1/libabi/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/libabi/Makefile.am.libs oprofile-0.9.5/libabi/Makefile.am
+--- oprofile-0.9.5/libabi/Makefile.am.libs	2009-07-31 13:10:20.000000000 -0400
++++ oprofile-0.9.5/libabi/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -10,15 +10,15 @@ AM_CPPFLAGS = \
  
  AM_CXXFLAGS = @OP_CXXFLAGS@
@@ -52,9 +52,9 @@ diff -up oprofile-0.9.4rc1/libabi/Makefi
 -	../libutil/libutil.a
 +	../libutil++/liboputil++.a \
 +	../libutil/liboputil.a
-diff -up oprofile-0.9.4rc1/libabi/tests/Makefile.am.libs oprofile-0.9.4rc1/libabi/tests/Makefile.am
---- oprofile-0.9.4rc1/libabi/tests/Makefile.am.libs	2008-05-21 14:52:32.000000000 -0400
-+++ oprofile-0.9.4rc1/libabi/tests/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/libabi/tests/Makefile.am.libs oprofile-0.9.5/libabi/tests/Makefile.am
+--- oprofile-0.9.5/libabi/tests/Makefile.am.libs	2009-07-31 13:10:20.000000000 -0400
++++ oprofile-0.9.5/libabi/tests/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -13,9 +13,9 @@ check_PROGRAMS = abi_test
  
  abi_test_SOURCES = abi_test.cpp
@@ -68,11 +68,11 @@ diff -up oprofile-0.9.4rc1/libabi/tests/
 -	../../libutil/libutil.a
 +	../../libutil++/liboputil++.a \
 +	../../libutil/liboputil.a
-diff -up oprofile-0.9.4rc1/libutil/Makefile.am.libs oprofile-0.9.4rc1/libutil/Makefile.am
---- oprofile-0.9.4rc1/libutil/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/libutil/Makefile.am	2008-06-01 13:41:19.000000000 -0400
-@@ -2,8 +2,8 @@ SUBDIRS = . tests
- 
+diff -up oprofile-0.9.5/libutil/Makefile.am.libs oprofile-0.9.5/libutil/Makefile.am
+--- oprofile-0.9.5/libutil/Makefile.am.libs	2009-07-31 13:10:19.000000000 -0400
++++ oprofile-0.9.5/libutil/Makefile.am	2009-08-04 14:05:32.000000000 -0400
+@@ -3,8 +3,8 @@ SUBDIRS = . tests
+ AM_CPPFLAGS=-I ${top_srcdir}/libop
  AM_CFLAGS = @OP_CFLAGS@
  
 -noinst_LIBRARIES = libutil.a
@@ -82,9 +82,9 @@ diff -up oprofile-0.9.4rc1/libutil/Makef
  	op_deviceio.c \
  	op_lockfile.c \
  	op_file.c \
-diff -up oprofile-0.9.4rc1/libutil++/Makefile.am.libs oprofile-0.9.4rc1/libutil++/Makefile.am
---- oprofile-0.9.4rc1/libutil++/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/libutil++/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/libutil++/Makefile.am.libs oprofile-0.9.5/libutil++/Makefile.am
+--- oprofile-0.9.5/libutil++/Makefile.am.libs	2009-07-31 13:10:19.000000000 -0400
++++ oprofile-0.9.5/libutil++/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -7,8 +7,8 @@ AM_CPPFLAGS= \
  
  AM_CXXFLAGS = @OP_CXXFLAGS@
@@ -96,9 +96,9 @@ diff -up oprofile-0.9.4rc1/libutil++/Mak
  	op_bfd.cpp \
  	op_bfd.h \
  	bfd_support.cpp \
-diff -up oprofile-0.9.4rc1/opjitconv/Makefile.am.libs oprofile-0.9.4rc1/opjitconv/Makefile.am
---- oprofile-0.9.4rc1/opjitconv/Makefile.am.libs	2008-06-01 13:42:53.000000000 -0400
-+++ oprofile-0.9.4rc1/opjitconv/Makefile.am	2008-06-01 13:43:04.000000000 -0400
+diff -up oprofile-0.9.5/opjitconv/Makefile.am.libs oprofile-0.9.5/opjitconv/Makefile.am
+--- oprofile-0.9.5/opjitconv/Makefile.am.libs	2009-07-31 13:10:18.000000000 -0400
++++ oprofile-0.9.5/opjitconv/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -6,7 +6,7 @@ bin_PROGRAMS = opjitconv
  LIBS = @BFD_LIBS@
  
@@ -108,9 +108,9 @@ diff -up oprofile-0.9.4rc1/opjitconv/Mak
  
  opjitconv_LDADD = $(needed_libs)
  
-diff -up oprofile-0.9.4rc1/pp/Makefile.am.libs oprofile-0.9.4rc1/pp/Makefile.am
---- oprofile-0.9.4rc1/pp/Makefile.am.libs	2008-05-21 14:52:30.000000000 -0400
-+++ oprofile-0.9.4rc1/pp/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/pp/Makefile.am.libs oprofile-0.9.5/pp/Makefile.am
+--- oprofile-0.9.5/pp/Makefile.am.libs	2009-07-31 13:10:18.000000000 -0400
++++ oprofile-0.9.5/pp/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -19,9 +19,9 @@ common_libs =  \
  	../libpp/libpp.a \
  	../libopt++/libopt++.a \
@@ -123,9 +123,9 @@ diff -up oprofile-0.9.4rc1/pp/Makefile.a
  	../libdb/libodb.a
  
  opreport_SOURCES = opreport.cpp \
-diff -up oprofile-0.9.4rc1/utils/Makefile.am.libs oprofile-0.9.4rc1/utils/Makefile.am
---- oprofile-0.9.4rc1/utils/Makefile.am.libs	2008-05-21 14:52:31.000000000 -0400
-+++ oprofile-0.9.4rc1/utils/Makefile.am	2008-06-01 13:41:19.000000000 -0400
+diff -up oprofile-0.9.5/utils/Makefile.am.libs oprofile-0.9.5/utils/Makefile.am
+--- oprofile-0.9.5/utils/Makefile.am.libs	2009-07-31 13:10:18.000000000 -0400
++++ oprofile-0.9.5/utils/Makefile.am	2009-08-04 14:01:40.000000000 -0400
 @@ -7,4 +7,4 @@ bin_PROGRAMS = ophelp
  dist_bin_SCRIPTS = opcontrol
  


