rpms/groff/F-12 groff-pic2graph-mktemp.patch, NONE, 1.1 groff.spec, 1.68, 1.69

[jvcelak]

Author: jvcelak

Update of /cvs/pkgs/rpms/groff/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32679

Modified Files:
	groff.spec 
Added Files:
	groff-pic2graph-mktemp.patch 
Log Message:
Resolves: #588232 (pic2graph requires coreutils 8.1 or later)


groff-pic2graph-mktemp.patch:
 pic2graph.sh |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE groff-pic2graph-mktemp.patch ---
Author: Jan Vcelak <jvcelak at redhat.com>
Related: bz#588232

Fixes 'pic2graph' tool which didn't work due to coreutils version.
Broken tool uses 'mktemp XXX.extension' which was introduced in coreutils 8.1,
currently there is version 7.6 in Fedora 12.

diff -u -urp groff-1.18.1.4/contrib/pic2graph/pic2graph.sh groff-1.18.1.4.fixed/contrib/pic2graph/pic2graph.sh
--- groff-1.18.1.4/contrib/pic2graph/pic2graph.sh	2010-05-04 11:51:27.272577099 +0200
+++ groff-1.18.1.4.fixed/contrib/pic2graph/pic2graph.sh	2010-05-04 11:54:47.105701209 +0200
@@ -74,8 +74,10 @@ fi
 # 3. Process through groff to emit Postscript.
 # 4. Use convert(1) to crop the PostScript and turn it into a bitmap.
 
-tmpps=`mktemp /tmp/pic2graph-XXXXXXXX.ps`
-tmpfmt=`mktemp /tmp/pic2graph-XXXXXXXX.$format`
+tmpps=`mktemp /tmp/pic2graph-XXXXXXXX`
+tmpfmt=`mktemp /tmp/pic2graph-XXXXXXXX`
+mv $tmpps ${tmpps}.ps && tmpps=${tmpps}.ps
+mv $tmpfmt ${tmpfmt}.${format} && tmpfmt=${tmpfmt}.${format}
 trap "rm $tmpps $tmpfmt" 0 2 15
 (echo ".EQ"; echo $eqndelim; echo ".EN"; echo ".PS"; cat; echo ".PE") | \
        groff -e -p $groffpic_opts -Tps >$tmpps \


Index: groff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/groff/F-12/groff.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- groff.spec	7 Apr 2010 14:44:37 -0000	1.68
+++ groff.spec	4 May 2010 10:36:38 -0000	1.69
@@ -3,7 +3,7 @@
 Summary: A document formatting system
 Name:	groff
 Version: 1.18.1.4
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: GPLv2 and GFDL
 Group: Applications/Publishing
 URL: http://groff.ffii.org
@@ -28,6 +28,7 @@ Patch13: groff-1.18.1.1-spacefix.patch
 Patch14: groff-1.18.1.4-sectmp.patch
 Patch15: groff-1.18.1.4-gcc4.3.0.patch
 Patch16: groff-groffer.patch
+Patch17: groff-pic2graph-mktemp.patch
  
 Requires: mktemp
 Requires: /sbin/install-info
@@ -91,6 +92,7 @@ System display.
 %patch14 -p1 -b .sectmp
 %patch15 -p1 -b .gcc43
 %patch16 -p1 -b .groffer
+%patch17 -p1 -b .mktemp
 
 for i in contrib/mm/{groff_mm,groff_mmse,mmroff}.man \
 		src/devices/grolbp/grolbp.man; do
@@ -207,6 +209,9 @@ exit 0
 %endif
 
 %changelog
+* Tue May 04 2010 Jan Vcelak <jvcelak at redhat.com> - 1.18.1.4-21
+- Fixes not working pic2graph (#588232).
+
 * Wed Apr 6 2010 Jan Vcelak	<jvcelak at redhat.com> - 1.18.1.4-20
 - Fixes not working groffer (#468102).