From 63174f30f9ff1d6e6d8cc6142aaac9f43362b85c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Oct 20 2004 21:28:19 +0000 Subject: fix multilib some more --- diff --git a/gpm-1.20.1-multilib.patch b/gpm-1.20.1-multilib.patch index f1fcd12..723ee2b 100644 --- a/gpm-1.20.1-multilib.patch +++ b/gpm-1.20.1-multilib.patch @@ -1,5 +1,14 @@ ---- gpm-1.20.1/doc/Makefile.in.orig 2004-10-20 15:01:00.632467098 -0400 -+++ gpm-1.20.1/doc/Makefile.in 2004-10-20 15:02:08.596188418 -0400 +--- gpm-1.20.1/doc/Makefile.in.multilib 2002-12-24 17:57:16.000000000 -0500 ++++ gpm-1.20.1/doc/Makefile.in 2004-10-20 17:25:11.000000000 -0400 +@@ -97,7 +97,7 @@ + + # Main portion + +-all: $(srcdir)/gpm.info $(MANPAGES) ++all: gpm.info $(MANPAGES) + + # why gpmdoc.ps and gpm.ps?? + # there is no gpm.ps in my tree and no rule to generate gpm.ps. @@ -131,8 +131,8 @@ #i keep all my infopages compressed and i'm tired to do it by #hand, so check if there are any compressed pages and do this @@ -11,8 +20,8 @@ # Hmm.... shouldn't man pages be compressed too? # maybe they should, but at least at my system they are not. ---- gpm-1.20.1/contrib/Makefile.in.orig 2004-10-20 15:36:18.471336949 -0400 -+++ gpm-1.20.1/contrib/Makefile.in 2004-10-20 15:38:02.104189510 -0400 +--- gpm-1.20.1/contrib/Makefile.in.multilib 2002-12-24 17:57:16.000000000 -0500 ++++ gpm-1.20.1/contrib/Makefile.in 2004-10-20 17:11:38.000000000 -0400 @@ -9,10 +9,10 @@ include $(top_builddir)/Makefile.include diff --git a/gpm.spec b/gpm.spec index 1f295c9..493c859 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: 64 +Release: 65 License: GPL Group: System Environment/Daemons Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz @@ -174,6 +174,9 @@ fi %{_libdir}/libgpm.so %changelog +* Wed Oct 20 2004 Bill Nottingham 1.20.1-65 +- remove buildroot paths from gpm.info, fixing #135305 + * Wed Oct 20 2004 Adrian Havill 1.20.1-64 - fixing multilib conflict (#135305): o remove buildsys check/conditional for gziping info pages (let rpm