rpms/oprofile/devel oprofile-0.9.3-ld_options.patch, NONE, 1.1 oprofile.spec, 1.56, 1.57

[William Eden Cohen (wcohen)]

Author: wcohen

Update of /cvs/pkgs/rpms/oprofile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19623

Modified Files:
	oprofile.spec 
Added Files:
	oprofile-0.9.3-ld_options.patch 
Log Message:
* Mon Oct 8 2007 Will Cohen <wcohen at redhat.com> - 0.9.3-3
- Allow short forms of --list-events (-l)  and --dump (-d).
  Resolves: rhbz#234003.




oprofile-0.9.3-ld_options.patch:

--- NEW FILE oprofile-0.9.3-ld_options.patch ---
Index: utils/opcontrol
===================================================================
RCS file: /cvsroot/oprofile/oprofile/utils/opcontrol,v
retrieving revision 1.140
diff -U2 -u -r1.140 opcontrol
--- utils/opcontrol	25 Sep 2007 17:24:32 -0000	1.140
+++ utils/opcontrol	5 Oct 2007 15:38:12 -0000
@@ -1668,13 +1668,23 @@
 do_init
 if test `id -u` != "0"; then
-    if test "$1" = "--dump" -a -z "$2"; then
-	ONLY_DUMP=yes
-	do_dump
-	exit 0;
-    elif test "$1" = "--list-events" -a -z "$2"; then
-	exec $OPHELP
+    if -z "$2"; then
+	case "$1" in 
+	--dump|-d)
+	    ONLY_DUMP=yes
+	    do_dump
+	    exit 0;
+	    ;;
+	--list-events|-l)
+	    exec $OPHELP
+	    exit 0;
+	    ;;
+	*)
+	    echo "Normal users are limited to either '--dump' or '--list-events'." >&2
+	    exit 1
+	    ;;
+	esac
     else
-	echo "Normal users are limited to either '--dump' or '--list-events'." >&2
-	exit 1
+	    echo "Normal users are limited to either '--dump' or '--list-events'." >&2
+	    exit 1
     fi
 fi


Index: oprofile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- oprofile.spec	21 Aug 2007 18:39:19 -0000	1.56
+++ oprofile.spec	8 Oct 2007 13:51:06 -0000	1.57
@@ -13,6 +13,7 @@
 Patch10: oprofile-0.4-guess2.patch
 Patch63: oprofile-0.7-libs.patch
 Patch83: oprofile-0.9.1-xen.patch
+Patch92: oprofile-0.9.3-ld_options.patch
 URL: http://oprofile.sf.net
 
 ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparc sparc64
@@ -64,6 +65,7 @@
 #%patch89 -p0 -b .ppc64doc
 #%patch90 -p0 -b .race
 #%patch91 -p1 -b .k10
+%patch92 -p0 -b .ld_option
 
 ./autogen.sh
 
@@ -178,6 +180,10 @@
 %{_bindir}/oprof_start
 
 %changelog
+* Mon Oct 8 2007 Will Cohen <wcohen at redhat.com> - 0.9.3-3
+- Allow short forms of --list-events (-l)  and --dump (-d).
+  Resolves: rhbz#234003.
+
 * Tue Aug 21 2007 Will Cohen <wcohen at redhat.com> - 0.9.3-3
 - rebuild