diff options
| author | jvcelak <jvcelak@fedoraproject.org> | 2010-05-04 10:36:38 +0000 |
|---|---|---|
| committer | jvcelak <jvcelak@fedoraproject.org> | 2010-05-04 10:36:38 +0000 |
| commit | 5f7566e51af05157e45ee3e45edb3dc648c7b8ed (patch) | |
| tree | 10dcd10f11279c51636af8e45b6e1a84279276cf | |
| parent | 00d04026e20949817609449a9a731ee0e34483a2 (diff) | |
| download | groff-5f7566e51af05157e45ee3e45edb3dc648c7b8ed.tar.gz groff-5f7566e51af05157e45ee3e45edb3dc648c7b8ed.tar.xz groff-5f7566e51af05157e45ee3e45edb3dc648c7b8ed.zip | |
Resolves: #588232 (pic2graph requires coreutils 8.1 or later)groff-1_18_1_4-21_fc12
| -rw-r--r-- | groff-pic2graph-mktemp.patch | 23 | ||||
| -rw-r--r-- | groff.spec | 7 |
2 files changed, 29 insertions, 1 deletions
diff --git a/groff-pic2graph-mktemp.patch b/groff-pic2graph-mktemp.patch new file mode 100644 index 0000000..bf78beb --- /dev/null +++ b/groff-pic2graph-mktemp.patch @@ -0,0 +1,23 @@ +Author: Jan Vcelak <jvcelak@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 \ @@ -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@redhat.com> - 1.18.1.4-21 +- Fixes not working pic2graph (#588232). + * Wed Apr 6 2010 Jan Vcelak <jvcelak@redhat.com> - 1.18.1.4-20 - Fixes not working groffer (#468102). |