rpms/oprofile/F-11 oprofile-0.7-libs.patch, 1.5, 1.6 oprofile-jvmpi-lgpl.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-serv6973

Modified Files:
	oprofile-0.7-libs.patch 
Removed Files:
	oprofile-jvmpi-lgpl.patch 
Log Message:
Update patches for oprofile-0.9.5.


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/F-11/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 Sep 2009 15:22:31 -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
  


--- oprofile-jvmpi-lgpl.patch DELETED ---