New version of groff 1.18.1.4

This commit is contained in:
Marcela Mašláňová 2006-10-23 13:06:48 +00:00
parent 16c6e476af
commit 3baff252fa
4 changed files with 62 additions and 15 deletions

View File

@ -1,4 +1,3 @@
groff-1.18.1.1.tar.gz
man-pages-ja-GNU_groff-20000115.tar.gz
mandocj.tar.gz
groff-1.19.1.tar.bz2
groff-1.18.1.4.tar.gz

View File

@ -0,0 +1,43 @@
--- groff-1.18.1.4/contrib/eqn2graph/eqn2graph.sh.sectmp 2006-10-23 14:12:41.000000000 +0200
+++ groff-1.18.1.4/contrib/eqn2graph/eqn2graph.sh 2006-10-23 14:20:20.000000000 +0200
@@ -63,12 +63,14 @@
# 2. Process through eqn(1) to emit troff markup.
# 3. Process through groff(1) to emit Postscript.
# 4. Use convert(1) to crop the Postscript and turn it into a bitmap.
-tmp=/tmp/eqn2graph-$$
-trap "rm ${tmp}.*" 0 2 15
+
+tmpps=`mktemp /tmp/eqn2graph-XXXXXXXX.ps`
+tmpfmt=`mktemp /tmp/eqn2graph-XXXXXXXX.$format`
+trap "rm $tmpps $tmpfmt" 0 2 15
read equation
(echo ".EQ"; echo 'delim $$'; echo ".EN"; echo '$'"${equation}"'$') | \
- groff -e $groff_opts -Tps >${tmp}.ps \
- && convert -crop 0x0 $convert_opts ${tmp}.ps ${tmp}.${format} \
- && cat ${tmp}.${format}
+ groff -e $groff_opts -Tps >$tmpps \
+ && convert -crop 0x0 $convert_opts $tmpps $tmpfmt \
+ && cat $tmpfmt
# End
--- groff-1.18.1.4/contrib/pic2graph/pic2graph.sh.sectmp 2006-10-23 14:12:41.000000000 +0200
+++ groff-1.18.1.4/contrib/pic2graph/pic2graph.sh 2006-10-23 14:18:57.000000000 +0200
@@ -73,11 +73,13 @@
# 2. Process through eqn and pic to emit troff markup.
# 3. Process through groff to emit Postscript.
# 4. Use convert(1) to crop the PostScript and turn it into a bitmap.
-tmp=/tmp/pic2graph-$$
-trap "rm ${tmp}.*" 0 2 15
+
+tmpps=`mktemp /tmp/pic2graph-XXXXXXXX.ps`
+tmpfmt=`mktemp /tmp/pic2graph-XXXXXXXX.$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 >${tmp}.ps \
- && convert -crop 0x0 $convert_opts ${tmp}.ps ${tmp}.${format} \
- && cat ${tmp}.${format}
+ groff -e -p $groffpic_opts -Tps >$tmpps \
+ && convert -crop 0x0 $convert_opts $tmpps $tmpfmt \
+ && cat $tmpfmt
# End

View File

@ -2,8 +2,8 @@
Summary: A document formatting system.
Name: groff
Version: 1.18.1.1
Release: 11.1
Version: 1.18.1.4
Release: 1
License: GPL
Group: Applications/Publishing
Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
@ -24,14 +24,14 @@ Patch13: groff-1.18.1-gzext.patch
Patch14: groff-xlibs.patch
Patch15: groff-1.18.1-fix15.patch
Patch16: groff-1.18.1-devutf8.patch
Patch17: groff-1.18.1.1-revision.patch
#Patch17: groff-1.18.1.3-revision.patch
Patch18: groff-1.18.1.1-do_char.patch
Patch19: groff-1.18.1.1-grn.patch
Patch20: groff-1.18.1.1-tempfile.patch
Patch21: groff-1.18.1.1-gcc41.patch
#Patch19: groff-1.18.1.1-grn.patch
#Patch20: groff-1.18.1.1-tempfile.patch
#Patch21: groff-1.18.1.1-gcc41.patch
Patch22: groff-1.18.1.1-bigendian.patch
Patch23: groff-1.18.1.1-spacefix.patch
Patch24: groff-1.18.1.1-sectmp.patch
Patch24: groff-1.18.1.4-sectmp.patch
URL: ftp://ftp.gnu.org/gnu/groff/
Requires: mktemp
@ -92,11 +92,11 @@ System display.
%patch14 -p1
%patch15 -p1 -b .fix9
%patch16 -p1 -b .devutf8
%patch17 -p1 -b .revision
#%patch17 -p1 -b .revision
%patch18 -p1 -b .do_char
%patch19 -p1 -b .grn
%patch20 -p1 -b .tempfile
%patch21 -p1 -b .gcc41
#%patch19 -p1 -b .grn
#%patch20 -p1 -b .tempfile
#%patch21 -p1 -b .gcc41
%patch22 -p1 -b .bigendian
%patch23 -p1 -b .spacefix
%patch24 -p1 -b .sectmp
@ -194,6 +194,7 @@ fi
%doc doc/meintro.me doc/meref.me doc/pic.ms
%{_datadir}/groff
%{_infodir}/groff*
%{_libdir}/groff
%files perl
%defattr(-,root,root)
@ -212,6 +213,9 @@ fi
%endif
%changelog
* Mon Oct 23 2006 Marcela Maslanova <mmaslano@redhat.com> - 1.18.1.4-1
- new version from upstream - update groffer
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.18.1.1-11.1
- rebuild
@ -223,6 +227,8 @@ fi
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.18.1.1-9.2
- bump again for double-long bug on ppc(64)
- bump again for double-long bug on ppc(64)
- bump again for double-long bug on ppc(64)
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.18.1.1-9.1
- rebuilt for new gcc4.1 snapshot and glibc changes
@ -536,7 +542,6 @@ fi
* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
- auto rebuild in the new build environment (release 9)
* Tue Feb 16 1999 Cristian Gafton <gafton@redhat.com>
- glibc 2.1 patch for xditview (#992)

View File

@ -1,3 +1,3 @@
511dbd64b67548c99805f1521f82cc5e groff-1.18.1.1.tar.gz
9bbf9b74fd587d248e17543bda4ce5de man-pages-ja-GNU_groff-20000115.tar.gz
e5d7f3273b4d53033723fcd2654d980c mandocj.tar.gz
ceecb81533936d251ed015f40e5f7287 groff-1.18.1.4.tar.gz