rpms/gpm/FC-5 gpm-1.20.1-default-handler.patch, NONE, 1.1 gpm.spec, 1.45, 1.46

[fedora-cvs-commits at redhat.com]

Author: tjanouse

Update of /cvs/dist/rpms/gpm/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv672

Modified Files:
	gpm.spec 
Added Files:
	gpm-1.20.1-default-handler.patch 
Log Message:
* Wed May 23 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-84
- applied patch for #240389, fixing default handlers

* Thu May 03 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-83
- gpm-devel now requires version-release correctly, fixes #238785


gpm-1.20.1-default-handler.patch:
 liblow.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE gpm-1.20.1-default-handler.patch ---
--- gpm-1.20.1/src/lib/liblow.c.orig	2002-12-24 23:57:16.000000000 +0100
+++ gpm-1.20.1/src/lib/liblow.c	2007-05-17 01:48:02.000000000 +0200
@@ -249,7 +249,7 @@
             gpm_report(GPM_PR_OOPS,GPM_MESS_NO_MEM);
          memcpy(tty,option.consolename,strlen(option.consolename)-1);
          sprintf(&tty[strlen(option.consolename)-1],"%i",flag);
-      } else { /* use your current vc */ 
+      } else if (flag==0) { /* use your current vc */ 
          if (isatty(0)) tty = ttyname(0);             /* stdin */
          if (!tty && isatty(1)) tty = ttyname(1);     /* stdout */
          if (!tty && isatty(2)) tty = ttyname(2);     /* stderr */
@@ -265,7 +265,8 @@
          }
           
          conn->vc=atoi(&tty[strlen(option.consolename)-1]);
-      }
+      } else /* a default handler -- use console */
+        tty = strdup(option.consolename);
 
       if (gpm_consolefd == -1)
          if ((gpm_consolefd=open(tty,O_WRONLY)) < 0) {


Index: gpm.spec
===================================================================
RCS file: /cvs/dist/rpms/gpm/FC-5/gpm.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gpm.spec	2 Apr 2007 14:20:57 -0000	1.45
+++ gpm.spec	23 May 2007 13:05:15 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console.
 Name: gpm
 Version: 1.20.1
-Release: 82%{?dist}
+Release: 84%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz
@@ -22,6 +22,7 @@
 Patch22: gpm-1.20.1-close-fds.patch
 Patch23: gpm-1.20.1-aligned-sleep.patch
 Patch24: gpm-1.20.1-deadsocket.patch
+Patch25: gpm-1.20.1-default-handler.patch
 
 Prereq: /sbin/chkconfig /sbin/ldconfig /sbin/install-info
 Requires: bash >= 2.0
@@ -39,7 +40,7 @@
 
 
 %package devel
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 Summary: A mouse server for the Linux console.
 Group: System Environment/Daemons
 
@@ -68,6 +69,7 @@
 %patch22 -p1 -b .close-fds
 %patch23 -p1 -b .aligned-sleep
 %patch24 -p1 -b .deadsocket
+%patch25 -p1 -b /default-handler
 
 %build
 rm -f configure
@@ -186,6 +188,12 @@
 %{_libdir}/libgpm.so
 
 %changelog
+* Wed May 23 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-84
+- applied patch for #240389, fixing default handlers
+
+* Thu May 03 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-83
+- gpm-devel now requires version-release correctly, fixes #238785
+
 * Mon Apr 02 2007 Tomas Janousek <tjanouse at redhat.com> - 1.20.1-82
 - updated inputattach.c to 1.24 from cvs, fixes #231635