From 1f264ed01571387e84822a90b99e9bbfc6502124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Mon, 8 Oct 2007 08:19:31 +0000 Subject: [PATCH] path for groffer wasn't set correctly #89210 --- groff-1.18.1.4-grofferpath.patch | 22 ++++++++++++++++++++++ groff.spec | 7 ++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 groff-1.18.1.4-grofferpath.patch diff --git a/groff-1.18.1.4-grofferpath.patch b/groff-1.18.1.4-grofferpath.patch new file mode 100644 index 0000000..6f95036 --- /dev/null +++ b/groff-1.18.1.4-grofferpath.patch @@ -0,0 +1,22 @@ +diff -up groff-1.18.1.4/contrib/groffer/groffer.sh.old groff-1.18.1.4/contrib/groffer/groffer.sh +--- groff-1.18.1.4/contrib/groffer/groffer.sh.old 2006-10-04 22:35:39.000000000 +0200 ++++ groff-1.18.1.4/contrib/groffer/groffer.sh 2007-10-08 09:01:29.000000000 +0200 +@@ -129,7 +129,7 @@ no) + esac; + + export _GROFFER2_SH; # file name of the script that follows up +-_GROFFER2_SH="${_GROFFER_LIBDIR}"'groffer2.sh'; ++_GROFFER2_SH="${_GROFFER_LIBDIR}${_GROFF_VERSION}"'groffer2.sh'; + + export _GROFFER_SH; # file name of this shell script + case "$0" in +@@ -331,7 +331,8 @@ fi; + if test _"${_SHELL}"_ = __ + then + # no shell found, so start groffer2.sh normally +- eval . "'${_GROFFER2_SH}'" '"$@"'; ++ #eval . "'${_GROFFER2_SH}'" '"$@"'; ++ eval . "/usr/share/groff/${_GROFF_VERSION}/groffer/groffer2.sh" '"$@"'; + exit; + else + # start groffer2.sh with the found $_SHELL diff --git a/groff.spec b/groff.spec index 298de4f..981ebab 100644 --- a/groff.spec +++ b/groff.spec @@ -3,7 +3,7 @@ Summary: A document formatting system Name: groff Version: 1.18.1.4 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 and GFDL Group: Applications/Publishing URL: http://groff.ffii.org @@ -33,6 +33,7 @@ Patch18: groff-1.18.1.1-do_char.patch #Patch22: groff-1.18.1.1-bigendian.patch Patch23: groff-1.18.1.1-spacefix.patch Patch24: groff-1.18.1.4-sectmp.patch +Patch25: groff-1.18.1.4-grofferpath.patch Requires: mktemp Requires: /sbin/install-info @@ -99,6 +100,7 @@ System display. #%patch22 -p1 -b .bigendian %patch23 -p1 -b .spacefix %patch24 -p1 -b .sectmp +%patch25 -p1 -b .grofferpath for i in contrib/mm/{groff_mm,groff_mmse,mmroff}.man \ src/devices/grolbp/grolbp.man; do @@ -237,6 +239,9 @@ exit 0 %endif %changelog +* Mon Oct 8 2007 Marcela Maslanova - 1.18.1.4-10 +- path for groffer wasn't set correctly #89210 + * Mon Sep 17 2007 Marcela Maslanova - 1.18.1.4-9 - fix license