rpms/groff/F-7 groff-1.18.1.4-grofferpath.patch, NONE, 1.1 groff.spec, 1.50, 1.51

[Marcela Mašláňová (mmaslano)]

Author: mmaslano

Update of /cvs/pkgs/rpms/groff/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7986

Modified Files:
	groff.spec 
Added Files:
	groff-1.18.1.4-grofferpath.patch 
Log Message:
path to groffer wasn't set correct rhbz#321431


groff-1.18.1.4-grofferpath.patch:

--- NEW FILE groff-1.18.1.4-grofferpath.patch ---
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


Index: groff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/groff/F-7/groff.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- groff.spec	16 Aug 2007 14:14:23 -0000	1.50
+++ groff.spec	22 Oct 2007 06:57:19 -0000	1.51
@@ -3,7 +3,7 @@
 Summary: A document formatting system
 Name:	groff
 Version: 1.18.1.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Publishing
 URL: http://groff.ffii.org
@@ -33,6 +33,7 @@
 #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 @@
 #%patch22 -p1 -b .bigendian
 %patch23 -p1 -b .spacefix
 %patch24 -p1 -b .sectmp
+%patch25 -p1 -b .path
 
 for i in contrib/mm/{groff_mm,groff_mmse,mmroff}.man \
 		src/devices/grolbp/grolbp.man; do
@@ -233,6 +235,10 @@
 %endif
 
 %changelog
+* Fri Oct 19 2007 Marcela Maslanova <mmaslano at redhat.com> - 1.18.1.4-7
+- path to groffer wasn't set correct
+- Resolves: rhbz#321431
+
 * Thu Aug 16 2007 Marcela Maslanova <mmaslano at redhat.com> - 1.18.1.4-6
 - rebuild
 - nroff was changed: man pages are printed, when partion is ro and