diff --git a/gpm-1.20.1-verbosity.patch b/gpm-1.20.1-verbosity.patch new file mode 100644 index 0000000..ed246b0 --- /dev/null +++ b/gpm-1.20.1-verbosity.patch @@ -0,0 +1,102 @@ +--- doc/doc.gpm.in ++++ doc/doc.gpm.in +@@ -450,16 +450,6 @@ + @item -v + Print version information and exit. + +-@item -V[@var{verbosity increment}] +- Raise or decrease the maximum level of messages that will be +- logged. Thus a positive argument has the effect of making the +- program more verbose. One can also give a negative argument to +- hush the program; due to @b{getopt(3)} rules, any optional +- argument needs to be passed without a space in between! +- When omitting the argument, the increment defaults to 1. +- Default verbosity level is 5 (@code{LOG_NOTICE}). +- @xref{Program Arguments,,,libc}. +- + @item -2 + Force two buttons. This means that the middle button, if any, + will be taken as it was the right one. +@@ -1993,15 +1993,6 @@ + mechanism. This is useful for debugging; in previous releases + it was done with a compile-time option. + +-@item -V @var{verbosity increment} +- Raise the maximum level of messages that will be logged. Thus a +- positive argument has the effect of making the program more +- verbose. One can also give a negative argument to hush the +- program; however, note that due to @b{getopt(3)} rules a negative +- argument must follow the option with no space betwixt (that is, +- @samp{-V-1} but not @samp{-V -1}). @xref{Program Arguments,,,libc}. +- The argument is optional and its default value is 1. +- + @end table + + Each time a menu is drawn, the configuration file is reparsed if it has +--- doc/gpm.info ++++ doc/gpm.info +@@ -333,16 +333,6 @@ + `-v' + Print version information and exit. + +-`-V[VERBOSITY INCREMENT]' +- Raise or decrease the maximum level of messages that will be +- logged. Thus a positive argument has the effect of making the +- program more verbose. One can also give a negative argument to +- hush the program; due to getopt(3) rules, any optional argument +- needs to be passed without a space in between! When omitting the +- argument, the increment defaults to 1. Default verbosity level is +- 5 (`LOG_NOTICE'). *Note Program Arguments: (libc)Program +- Arguments. +- + `-2' + Force two buttons. This means that the middle button, if any, will + be taken as it was the right one. +@@ -1606,15 +1606,6 @@ + mechanism. This is useful for debugging; in previous releases it + was done with a compile-time option. + +-`-V VERBOSITY INCREMENT' +- Raise the maximum level of messages that will be logged. Thus a +- positive argument has the effect of making the program more +- verbose. One can also give a negative argument to hush the +- program; however, note that due to getopt(3) rules a negative +- argument must follow the option with no space betwixt (that is, +- `-V-1' but not `-V -1'). *Note Program Arguments: (libc)Program +- Arguments. The argument is optional and its default value is 1. +- + Each time a menu is drawn, the configuration file is reparsed if it + has changed. This allows modification of personal setup without + reinvoking the daemon. +--- src/prog/gpm-root.y ++++ src/prog/gpm-root.y +@@ -868,7 +868,6 @@ + " -m modifier to use\n" + " -u inhibit user configuration files\n" + " -D don't auto-background and run as daemon\n" +- " -V increase amount of logged messages\n" + ); + + return 1; +--- src/gpn.c ++++ src/gpn.c +@@ -281,6 +281,7 @@ + case 'u': option.autodetect = 1; break; + case 'T': opt_test++; break; + case 'v': printf(GPM_MESS_VERSION "\n"); exit(0); ++ case 'V': break; /* gpm_debug_level not supported anymore */ + case '2': opt_three = -1; break; + case '3': opt_three = 1; break; + default: exit(usage("commandline")); +--- src/headers/message.h ++++ src/headers/message.h +@@ -98,8 +98,7 @@ + " -t mouse-type sets mouse type (default '%s')\n" \ + " Use a non-existent type (e.g. \"help\") to get a list\n" \ + " -T test: read mouse, no clients\n" \ +- " -v print version and exit\n" \ +- " -V verbosity increase number of logged messages\n\n\n" \ ++ " -v print version and exit\n\n\n" \ + " Examples:\n\n" \ + " gpm -m /dev/misc/psaux -t ps2 to start with a ps2 mouse\n" \ + " gpm -m /dev/tts/0 -t mman to use mouse man on COM1\n\n" diff --git a/gpm.changes b/gpm.changes index 05336be..a6b34ae 100644 --- a/gpm.changes +++ b/gpm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 27 16:18:07 CET 2007 - prusnak@suse.cz + +- verbosity.patch [#247230] + * removed -V option from documentation (not supported anymore) + * silented error when -V provided on command-line + ------------------------------------------------------------------- Tue Feb 13 14:03:56 CET 2007 - anosek@suse.cz diff --git a/gpm.spec b/gpm.spec index 6cf348e..7b3ccbf 100644 --- a/gpm.spec +++ b/gpm.spec @@ -18,7 +18,7 @@ Provides: select PreReq: /bin/sed %insserv_prereq %fillup_prereq Autoreqprov: on Version: 1.20.1 -Release: 346 +Release: 348 Summary: Console Mouse Support Source0: http://arcana.linux.it/pub/gpm/gpm-%{version}.tar.bz2 Source1: rcgpm @@ -39,6 +39,7 @@ Patch11: gpm-%{version}-Gpm_Open.patch Patch12: gpm-%{version}-daemon_mode.patch Patch13: gpm-%{version}-gunze-overflow.patch Patch14: gpm-%{version}-warnings.patch +Patch15: gpm-%{version}-verbosity.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %install_info_prereq @@ -72,6 +73,7 @@ Authors: %patch12 %patch13 %patch14 +%patch15 # cp %{S:1} %{S:2} %{S:3} . @@ -161,7 +163,11 @@ rm -rf $RPM_BUILD_ROOT /usr/share/emacs/site-lisp/* /var/adm/fillup-templates/* -%changelog -n gpm +%changelog +* Tue Feb 27 2007 - prusnak@suse.cz +- verbosity.patch [#247230] + * removed -V option from documentation (not supported anymore) + * silented error when -V provided on command-line * Tue Feb 13 2007 - anosek@suse.cz - fixed libgpm.so.1 is not owned by any package [#244447] (gpm-1.20.1.patch)