fix for #134389... read both /etc/sysconfig/mouse AND THEN

/etc/sysconfig/gpm, not just one file

gpm.init

@@ -12,11 +12,14 @@
 # source function library
 . /etc/init.d/functions
 
-if test -e /etc/sysconfig/mouse ; then
-    . /etc/sysconfig/mouse
+if test -e /etc/sysconfig/mouse
+then
+    source /etc/sysconfig/mouse
     MOUSECFG=/etc/sysconfig/mouse
-elif test -e /etc/sysconfig/gpm ; then
-    . /etc/sysconfig/gpm
+fi
+if test -e /etc/sysconfig/gpm
+then
+    source /etc/sysconfig/gpm
     MOUSECFG=/etc/sysconfig/gpm
 fi
 

gpm.spec

@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console.
 Name: gpm
 Version: 1.20.1
-Release: 56
+Release: 57
 License: GPL
 Group: System Environment/Daemons
 Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz
@@ -171,6 +171,10 @@ fi
 %{_libdir}/libgpm.so
 
 %changelog
+* Tue Oct 12 2004 Adrian Havill <havill@redhat.com> 1.20.1-57
+- read both the sysconfig/mouse and sysconfig/gpm (preferrence to gpm
+  settings), not just one of them, if both exist (#134389)
+
 * Tue Oct 12 2004 Florian La Roche <Florian.LaRoche@redhat.de>
 - remove gzip of info pages within .spec file, #135305