summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcela Mašláňová <mmaslano@fedoraproject.org>2007-10-08 08:19:31 +0000
committerMarcela Mašláňová <mmaslano@fedoraproject.org>2007-10-08 08:19:31 +0000
commit1f264ed01571387e84822a90b99e9bbfc6502124 (patch)
treee522107ca08f17dcad3c86549c2b3c2a2bc92583
parent806e68bff86c8842ac0b10ef928a75e219f8f2cf (diff)
downloadgroff-1f264ed01571387e84822a90b99e9bbfc6502124.tar.gz
groff-1f264ed01571387e84822a90b99e9bbfc6502124.tar.xz
groff-1f264ed01571387e84822a90b99e9bbfc6502124.zip
path for groffer wasn't set correctly #89210groff-1_18_1_4-10_fc8
-rw-r--r--groff-1.18.1.4-grofferpath.patch22
-rw-r--r--groff.spec7
2 files changed, 28 insertions, 1 deletions
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 <mmaslano@redhat.com> - 1.18.1.4-10
+- path for groffer wasn't set correctly #89210
+
* Mon Sep 17 2007 Marcela Maslanova <mmaslano@redhat.com> - 1.18.1.4-9
- fix license