rpms/oprofile/devel sources, 1.10, 1.11 oprofile.spec, 1.28, 1.29 oprofile-0.7-libs.patch, 1.2, 1.3

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Jun 8 20:35:07 UTC 2005 

Author: wcohen

Update of /cvs/dist/rpms/oprofile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7590

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




Index: sources
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	21 Mar 2005 15:25:55 -0000	1.10
+++ sources	8 Jun 2005 20:35:03 -0000	1.11
@@ -1 +1 @@
-a08c696910911d1f14585456829590f2  oprofile-0.8.2.tar.gz
+ef1abe789209c181877e2ec491f635e7  oprofile-0.9.tar.gz


Index: oprofile.spec
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- oprofile.spec	13 Apr 2005 15:04:23 -0000	1.28
+++ oprofile.spec	8 Jun 2005 20:35:03 -0000	1.29
@@ -1,9 +1,9 @@
-%define DATE 20050405
-%define oprofile_version 0.8.2
-%define oprofile_release 4
+%define DATE 20050608
+%define oprofile_version 0.9
+%define oprofile_release 1
 Summary: System wide profiler
 Name: oprofile
-Version: 0.8.2
+Version: 0.9
 Release: %{oprofile_release}
 License: GPL
 Group: Development/System
@@ -16,7 +16,7 @@
 #Patch35: oprofile-0.4-separatedebug.patch
 Patch63: oprofile-0.7-libs.patch
 #Patch79: oprofile-0.8.1-power970.patch
-Patch80: oprofile-0.8.2-ppc64dot.patch
+#Patch80: oprofile-0.8.2-ppc64dot.patch
 
 URL: http://oprofile.sf.net
 ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x
@@ -53,7 +53,7 @@
 %patch10 -p1 -b .guess2
 #%patch35 -p1 -b .separate
 %patch63 -p1 -b .libs
-%patch80 -p1 -b .ppc64dot
+#%patch80 -p1 -b .ppc64dot
 
 ./autogen.sh
 
@@ -126,23 +126,21 @@
 %doc doc/oprofile.html
 
 %{_bindir}/oprof_start
-%{_bindir}/op_help
-%{_bindir}/op_import
+%{_bindir}/ophelp
+%{_bindir}/opimport
 %{_bindir}/opannotate
 %{_bindir}/opcontrol
 %{_bindir}/opgprof
 %{_bindir}/opreport
 %{_bindir}/oprofiled
-%{_bindir}/opstack
 %{_bindir}/oparchive
 
-%{_mandir}/man1/op_help.1.gz
+%{_mandir}/man1/ophelp.1.gz
 %{_mandir}/man1/opannotate.1.gz
 %{_mandir}/man1/opcontrol.1.gz
 %{_mandir}/man1/opgprof.1.gz
 %{_mandir}/man1/opreport.1.gz
 %{_mandir}/man1/oprofile.1.gz
-%{_mandir}/man1/opstack.1.gz
 %{_mandir}/man1/oparchive.1.gz
 
 /usr/share/oprofile/alpha/ev4/events
@@ -229,6 +227,9 @@
 
 
 %changelog
+* Wed Jun 08 2005 Will Cohen <wcohen at redhat.com>
+- Rebase on OProfile 0.9.
+
 * Wed Apr 13 2005 Will Cohen <wcohen at redhat.com>
 - Add which dependency.
 

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

Index: oprofile-0.7-libs.patch
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/oprofile-0.7-libs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- oprofile-0.7-libs.patch	9 Sep 2004 09:48:15 -0000	1.2
+++ oprofile-0.7-libs.patch	8 Jun 2005 20:35:03 -0000	1.3
@@ -1,6 +1,33 @@
---- oprofile-0.7.1-0.20031124/daemon/Makefile.am.libs	2003-10-29 08:34:32.000000000 -0500
-+++ oprofile-0.7.1-0.20031124/daemon/Makefile.am	2003-11-24 15:39:36.000000000 -0500
-@@ -38,17 +38,17 @@
+--- oprofile-0.9/libutil/Makefile.am.orig	2005-03-25 17:51:07.000000000 -0500
++++ oprofile-0.9/libutil/Makefile.am	2005-06-08 14:17:14.000000000 -0400
+@@ -2,8 +2,8 @@
+ 
+ AM_CFLAGS = @OP_CFLAGS@
+ 
+-noinst_LIBRARIES = libutil.a
+-libutil_a_SOURCES = \
++noinst_LIBRARIES = liboputil.a
++liboputil_a_SOURCES = \
+ 	op_deviceio.c \
+ 	op_lockfile.c \
+ 	op_file.c \
+--- oprofile-0.9/pp/Makefile.am.orig	2005-04-04 16:54:23.000000000 -0400
++++ oprofile-0.9/pp/Makefile.am	2005-06-08 14:17:14.000000000 -0400
+@@ -19,9 +19,9 @@
+ 	../libpp/libpp.a \
+ 	../libopt++/libopt++.a \
+ 	../libregex/libop_regex.a \
+-	../libutil++/libutil++.a \
++	../libutil++/liboputil++.a \
+ 	../libop/libop.a \
+-	../libutil/libutil.a \
++	../libutil/liboputil.a \
+ 	../libdb/libodb.a
+ 
+ opreport_SOURCES = opreport.cpp \
+--- oprofile-0.9/daemon/Makefile.am.orig	2005-05-02 10:39:36.000000000 -0400
++++ oprofile-0.9/daemon/Makefile.am	2005-06-08 14:17:14.000000000 -0400
+@@ -41,17 +41,17 @@
  if enable_abi
  oprofiled_LDADD = \
  	liblegacy/liblegacy.a \
@@ -21,8 +48,8 @@
  LINKER=$(CC)
  endif
  
---- oprofile-0.7.1-0.20031124/gui/Makefile.am.libs	2003-11-06 16:19:15.000000000 -0500
-+++ oprofile-0.7.1-0.20031124/gui/Makefile.am	2003-11-24 15:37:25.000000000 -0500
+--- oprofile-0.9/gui/Makefile.am.orig	2005-03-25 17:51:07.000000000 -0500
++++ oprofile-0.9/gui/Makefile.am	2005-06-08 14:17:14.000000000 -0400
 @@ -26,9 +26,9 @@
  oprof_start_SOURCES = $(dist_sources)
  nodist_oprof_start_SOURCES = oprof_start.moc.cpp
@@ -35,9 +62,9 @@
  	ui/liboprof_start.a \
  	@QT_LDFLAGS@ \
  	@QT_LIB@ \
---- oprofile-0.7.1-0.20031124/libabi/Makefile.am.libs	2003-10-30 09:36:37.000000000 -0500
-+++ oprofile-0.7.1-0.20031124/libabi/Makefile.am	2003-11-24 15:41:38.000000000 -0500
-@@ -20,27 +20,27 @@
+--- oprofile-0.9/libabi/Makefile.am.orig	2005-04-28 16:09:46.000000000 -0400
++++ oprofile-0.9/libabi/Makefile.am	2005-06-08 14:21:40.000000000 -0400
+@@ -21,17 +21,17 @@
  
  AM_CXXFLAGS = @OP_CXXFLAGS@
  
@@ -46,10 +73,10 @@
 +noinst_LIBRARIES = libopabi.a
 +libopabi_a_SOURCES = abi.cpp op_abi.cpp
  
- bin_PROGRAMS = op_import
+ bin_PROGRAMS = opimport
  
- op_import_SOURCES = op_import.cpp
- op_import_LDADD = \
+ opimport_SOURCES = opimport.cpp
+ opimport_LDADD = \
 -	libabi.a \
 +	libopabi.a \
  	../libdb/libodb.a \
@@ -59,37 +86,28 @@
 +	../libutil++/liboputil++.a \
 +	../libutil/liboputil.a
  
- check_PROGRAMS = abi_test
+ endif
+--- oprofile-0.9/libabi/tests/Makefile.am.orig	2005-06-08 14:21:29.000000000 -0400
++++ oprofile-0.9/libabi/tests/Makefile.am	2005-06-08 14:22:37.000000000 -0400
+@@ -20,11 +20,11 @@
  
  abi_test_SOURCES = abi_test.cpp
  abi_test_LDADD = \
--	libabi.a \
-+	libopabi.a \
- 	../libdb/libodb.a \
- 	../libopt++/libopt++.a \
--	../libutil++/libutil++.a \
--	../libutil/libutil.a
-+	../libutil++/liboputil++.a \
-+	../libutil/liboputil.a
+-	../libabi.a \
++	../libopabi.a \
+ 	../../libop/libop.a \
+ 	../../libdb/libodb.a \
+ 	../../libopt++/libopt++.a \
+-	../../libutil++/libutil++.a \
+-	../../libutil/libutil.a
++	../../libutil++/liboputil++.a \
++	../../libutil/liboputil.a
  
  endif
---- oprofile-0.7.1-0.20031124/libutil/Makefile.am.libs	2003-09-26 11:27:02.000000000 -0400
-+++ oprofile-0.7.1-0.20031124/libutil/Makefile.am	2003-11-24 15:37:25.000000000 -0500
-@@ -2,8 +2,8 @@
- 
- AM_CFLAGS = @OP_CFLAGS@
- 
--noinst_LIBRARIES = libutil.a
--libutil_a_SOURCES = \
-+noinst_LIBRARIES = liboputil.a
-+liboputil_a_SOURCES = \
- 	op_deviceio.c \
- 	op_lockfile.c \
- 	op_file.c \
---- oprofile-0.7.1-0.20031124/libutil++/Makefile.am.libs	2003-11-03 09:42:34.000000000 -0500
-+++ oprofile-0.7.1-0.20031124/libutil++/Makefile.am	2003-11-24 15:37:25.000000000 -0500
-@@ -3,8 +3,8 @@
- AM_CPPFLAGS=-I ${top_srcdir}/libutil
+--- oprofile-0.9/libutil++/Makefile.am.orig	2005-04-19 16:28:50.000000000 -0400
++++ oprofile-0.9/libutil++/Makefile.am	2005-06-08 14:17:14.000000000 -0400
+@@ -5,8 +5,8 @@
+ 	-I ${top_srcdir}/libop
  AM_CXXFLAGS = @OP_CXXFLAGS@
  
 -noinst_LIBRARIES = libutil++.a
@@ -98,26 +116,12 @@
 +liboputil___a_SOURCES = \
  	op_bfd.cpp \
  	op_bfd.h \
- 	string_filter.cpp \
---- oprofile-0.7.1-0.20031124/pp/Makefile.am.libs	2003-10-30 09:36:42.000000000 -0500
-+++ oprofile-0.7.1-0.20031124/pp/Makefile.am	2003-11-24 15:37:25.000000000 -0500
-@@ -20,9 +20,9 @@
- 	../libpp/libpp.a \
- 	../libopt++/libopt++.a \
- 	../libregex/libop_regex.a \
--	../libutil++/libutil++.a \
-+	../libutil++/liboputil++.a \
- 	../libop/libop.a \
--	../libutil/libutil.a \
-+	../libutil/liboputil.a \
- 	../libdb/libodb.a
- 
- opreport_SOURCES = opreport.cpp \
---- oprofile-0.7.1-0.20031124/utils/Makefile.am.libs	2003-05-22 09:51:21.000000000 -0400
-+++ oprofile-0.7.1-0.20031124/utils/Makefile.am	2003-11-24 15:37:25.000000000 -0500
+ 	bfd_support.cpp \
+--- oprofile-0.9/utils/Makefile.am.orig	2005-03-31 11:49:28.000000000 -0500
++++ oprofile-0.9/utils/Makefile.am	2005-06-08 14:24:46.000000000 -0400
 @@ -7,4 +7,4 @@
  dist_bin_SCRIPTS = opcontrol
  
- op_help_SOURCES = op_help.c
--op_help_LDADD = ../libop/libop.a ../libutil/libutil.a
-+op_help_LDADD = ../libop/libop.a ../libutil/liboputil.a
+ ophelp_SOURCES = ophelp.c
+-ophelp_LDADD = ../libop/libop.a ../libutil/libutil.a
++ophelp_LDADD = ../libop/libop.a ../libutil/liboputil.a

More information about the fedora-cvs-commits mailing list