rpms/oprofile/F-10 oprofile-jvmpi-lgpl.patch, NONE, 1.1 oprofile-verbose.patch, NONE, 1.1 oprofile.spec, 1.75, 1.76
William Eden Cohen
wcohen at fedoraproject.org
Thu Jul 16 19:04:56 UTC 2009
Author: wcohen
Update of /cvs/pkgs/rpms/oprofile/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16078
Modified Files:
oprofile.spec
Added Files:
oprofile-jvmpi-lgpl.patch oprofile-verbose.patch
Log Message:
- Add shadow-utils to requires. Resolves: rhbz #501357
- Add LGPL license to provided java support. Resolves: rhbz #474666
- Correct handling of --verbose. Resolves: rhbz #454969
oprofile-jvmpi-lgpl.patch:
--- NEW FILE oprofile-jvmpi-lgpl.patch ---
diff -paur oprofile-0.9.4/agents/jvmpi/jvmpi_oprofile.cpp oprofile-0.9.4-JVMPI-LGPL/agents/jvmpi/jvmpi_oprofile.cpp
--- oprofile-0.9.4/agents/jvmpi/jvmpi_oprofile.cpp 2008-04-28 16:23:26.000000000 -0500
+++ oprofile-0.9.4-JVMPI-LGPL/agents/jvmpi/jvmpi_oprofile.cpp 2009-06-22 16:42:48.000000000 -0500
@@ -3,7 +3,20 @@
* JVMPI agent implementation to report jitted JVM code to OProfile
*
* @remark Copyright 2007 OProfile authors
- * @remark Read the file COPYING
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* @author Maynard Johnson
*
oprofile-verbose.patch:
--- NEW FILE oprofile-verbose.patch ---
diff -up oprofile-0.9.4/utils/opcontrol.verbose oprofile-0.9.4/utils/opcontrol
--- oprofile-0.9.4/utils/opcontrol.verbose 2009-06-21 22:16:24.000000000 -0400
+++ oprofile-0.9.4/utils/opcontrol 2009-06-21 22:39:34.000000000 -0400
@@ -335,40 +335,6 @@ do_init()
;;
esac
fi
-
- vecho "Parameters used:"
- vecho "SESSION_DIR $SESSION_DIR"
- vecho "LOCK_FILE $LOCK_FILE"
- vecho "SAMPLES_DIR $SAMPLES_DIR"
- vecho "CURRENT_SAMPLES_DIR $CURRENT_SAMPLES_DIR"
- vecho "CPUTYPE $CPUTYPE"
- if test "$BUF_SIZE" != "0"; then
- vecho "BUF_SIZE $BUF_SIZE"
- else
- vecho "BUF_SIZE default value"
- fi
- if test "$BUF_WATERSHED" != "0"; then
- vecho "BUF_WATERSHED $BUF_WATERSHED"
- else
- vecho "BUF_WATERSHED default value"
- fi
- if test "$KERNEL_SUPPORT" = "yes"; then
- if test "$CPU_BUF_SIZE" != "0"; then
- vecho "CPU_BUF_SIZE $CPU_BUF_SIZE"
- else
- vecho "CPU_BUF_SIZE default value"
- fi
- fi
-
- vecho "SEPARATE_LIB $SEPARATE_LIB"
- vecho "SEPARATE_KERNEL $SEPARATE_KERNEL"
- vecho "SEPARATE_THREAD $SEPARATE_THREAD"
- vecho "SEPARATE_CPU $SEPARATE_CPU"
- vecho "CALLGRAPH $CALLGRAPH"
- vecho "VMLINUX $VMLINUX"
- vecho "KERNEL_RANGE $KERNEL_RANGE"
- vecho "XENIMAGE $XENIMAGE"
- vecho "XEN_RANGE $XEN_RANGE"
}
@@ -1019,6 +985,40 @@ do_options()
echo "Option \"--passive-domains\" or "--domains" can only be used with option \"--start-daemon\" or \"--start\"." >&2
exit 1
fi
+
+ vecho "Parameters used:"
+ vecho "SESSION_DIR $SESSION_DIR"
+ vecho "LOCK_FILE $LOCK_FILE"
+ vecho "SAMPLES_DIR $SAMPLES_DIR"
+ vecho "CURRENT_SAMPLES_DIR $CURRENT_SAMPLES_DIR"
+ vecho "CPUTYPE $CPUTYPE"
+ if test "$BUF_SIZE" != "0"; then
+ vecho "BUF_SIZE $BUF_SIZE"
+ else
+ vecho "BUF_SIZE default value"
+ fi
+ if test "$BUF_WATERSHED" != "0"; then
+ vecho "BUF_WATERSHED $BUF_WATERSHED"
+ else
+ vecho "BUF_WATERSHED default value"
+ fi
+ if test "$KERNEL_SUPPORT" = "yes"; then
+ if test "$CPU_BUF_SIZE" != "0"; then
+ vecho "CPU_BUF_SIZE $CPU_BUF_SIZE"
+ else
+ vecho "CPU_BUF_SIZE default value"
+ fi
+ fi
+
+ vecho "SEPARATE_LIB $SEPARATE_LIB"
+ vecho "SEPARATE_KERNEL $SEPARATE_KERNEL"
+ vecho "SEPARATE_THREAD $SEPARATE_THREAD"
+ vecho "SEPARATE_CPU $SEPARATE_CPU"
+ vecho "CALLGRAPH $CALLGRAPH"
+ vecho "VMLINUX $VMLINUX"
+ vecho "KERNEL_RANGE $KERNEL_RANGE"
+ vecho "XENIMAGE $XENIMAGE"
+ vecho "XEN_RANGE $XEN_RANGE"
}
Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/F-10/oprofile.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- oprofile.spec 12 May 2009 18:33:04 -0000 1.75
+++ oprofile.spec 16 Jul 2009 19:04:56 -0000 1.76
@@ -3,19 +3,23 @@
Summary: System wide profiler
Name: oprofile
Version: 0.9.4
-Release: 9%{?dist}
+Release: 12%{?dist}
License: GPLv2
Group: Development/System
#
Source0: oprofile-%{version}.tar.gz
Requires: binutils
Requires: which
+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
+
URL: http://oprofile.sf.net
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparcv9 sparc64
@@ -76,7 +80,6 @@ Requires: /etc/ld.so.conf.d
This package includes a base JIT support library, as well as a Java
agent library.
-
%prep
%setup -q -n %{name}-%{version}
%patch10 -p1 -b .guess2
@@ -86,6 +89,8 @@ agent library.
#%patch100 -p1 -b .gcc43
%patch101 -p1 -b .basename
%patch102 -p1 -b .iaperf
+%patch103 -p1 -b .verbose
+%patch104 -p1 -b .lgpl
./autogen.sh
@@ -227,6 +232,11 @@ exit 0
/etc/ld.so.conf.d/*
%changelog
+* 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
+- Correct handling of --verbose. Resolves: rhbz #454969
+
* Mon May 11 2009 Will Cohen <wcohen at redhat.com> - 0.9.4-9
- Assign specific UID and GID to oprofile.
More information about the fedora-extras-commits
mailing list