rpms/cscope/F-12 cscope-15.6-help-options.patch, NONE, 1.1 cscope.spec, 1.41, 1.42

[Neil Horman]

Author: nhorman

Update of /cvs/pkgs/rpms/cscope/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14603

Modified Files:
	cscope.spec 
Added Files:
	cscope-15.6-help-options.patch 
Log Message:
Resolves: bz 528463

cscope-15.6-help-options.patch:
 main.c |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE cscope-15.6-help-options.patch ---
diff -up cscope-15.6/src/main.c.orig cscope-15.6/src/main.c
--- cscope-15.6/src/main.c.orig	2009-12-21 07:20:09.000000000 -0500
+++ cscope-15.6/src/main.c	2009-12-21 07:20:49.000000000 -0500
@@ -196,6 +196,10 @@ char ** parse_options(int *argc, char **
 		case 'e':	/* suppress ^E prompt between files */
 			editallprompt = NO;
 			break;
+		case 'h':
+			longusage();
+			myexit(1);
+			break;
 		case 'k':	/* ignore DFLT_INCDIR */
 			kernelmode = YES;
 			break;
@@ -208,6 +212,11 @@ char ** parse_options(int *argc, char **
 		case 'v':
 			verbosemode = YES;
 			break;
+		case 'V':
+			fprintf(stderr, "%s: version %d%s\n", argv0,
+				FILEVERSION, FIXVERSION);
+			myexit(0);
+			break;
 		case 'q':	/* quick search */
 			invertedindex = YES;
 			break;


Index: cscope.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cscope/F-12/cscope.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- cscope.spec	18 Dec 2009 13:42:04 -0000	1.41
+++ cscope.spec	21 Dec 2009 12:23:59 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: C source code tree search and browse tool 
 Name: cscope
 Version: 15.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.6.tar.gz 
 URL: http://cscope.sourceforge.net
 License: BSD 
@@ -22,6 +22,7 @@ Patch5:cscope-15.6-incdir-overflow.patch
 Patch6:cscope-15.6-invalid-opt.patch
 Patch7:cscope-15.6-argv-adjust.patch
 Patch8:cscope-15.6-linemode-options-readd.patch
+Patch9:cscope-15.6-help-options.patch
 
 %description
 cscope is a mature, ncurses based, C source code tree browsing tool.  It 
@@ -41,6 +42,7 @@ matches for use in file editing.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 export CFLAGS="%{optflags} -D_GNU_SOURCE"
@@ -90,6 +92,9 @@ rm -f %{xemacs_lisp_path}/xcscope.el
 rm -f %{emacs_lisp_path}/xcscope.el
 
 %changelog
+* Mon Dec 19 2009 Neil Horman <nhorman at redhat.com> 15.6-8
+- Added back missing help/version options (bz 528463)
+
 * Fri Dec 18 2009 Neil Horman <nhorman at redhat.com> 15.6-7
 - Fixed adjustment of argv that led to bad commandline behavior (bz 547023)
 - Added missing linemode operations to parse_options (bz 546993)