From 62dcfa904c8b8f982e10a693ffead7ec6e677d51 Mon Sep 17 00:00:00 2001 From: havill Date: Tue, 12 Oct 2004 19:46:20 +0000 Subject: [PATCH] fix for #134389... read both /etc/sysconfig/mouse AND THEN /etc/sysconfig/gpm, not just one file --- gpm.init | 11 +++++++---- gpm.spec | 6 +++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gpm.init b/gpm.init index be42f7f..e53bc4e 100755 --- a/gpm.init +++ b/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 diff --git a/gpm.spec b/gpm.spec index 7a46125..cb57e96 100644 --- a/gpm.spec +++ b/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 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 - remove gzip of info pages within .spec file, #135305