From 15f798d7856fb04cd82824b5b420c58c2be30d42 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Wed, 12 Jan 2005 14:08:37 +0000 Subject: [PATCH] - update to groff 1.19.1 - drop 8bit, fix15, devutf8, grn patches - sync the rest of patches with current release - spec cleanup --- .cvsignore | 1 + groff-1.16-safer.patch | 23 ++++++++---- groff-1.18-gzip.patch | 50 +++++++++++++------------- groff-1.18-nohtml.patch | 20 ++++++----- groff-1.18-pfbtops_cpp.patch | 10 +++--- groff-1.18.1-8bit.patch | 17 --------- groff-1.18.1-devutf8.patch | 12 ------- groff-1.18.1-fix15.patch | 27 -------------- groff-1.18.1-fixminus.patch | 10 +++--- groff-1.18.1-gzext.patch | 18 ++++++---- groff-1.18.1-korean.patch | 42 ++++++++++++---------- groff-1.18.1.1-grn.patch | 10 ------ groff-xlibs.patch | 8 ++--- groff.spec | 70 +++++++++++++++++------------------- sources | 1 + 15 files changed, 137 insertions(+), 182 deletions(-) delete mode 100644 groff-1.18.1-8bit.patch delete mode 100644 groff-1.18.1-fix15.patch delete mode 100644 groff-1.18.1.1-grn.patch diff --git a/.cvsignore b/.cvsignore index ee3c11e..90b6b2a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ groff-1.18.1.1.tar.gz man-pages-ja-GNU_groff-20000115.tar.gz mandocj.tar.gz +groff-1.19.1.tar.bz2 diff --git a/groff-1.16-safer.patch b/groff-1.16-safer.patch index de58923..1ddafb6 100644 --- a/groff-1.16-safer.patch +++ b/groff-1.16-safer.patch @@ -1,18 +1,21 @@ ---- groff-1.16/src/roff/troff/input.cc.safer Wed Jun 7 21:47:48 2000 -+++ groff-1.16/src/roff/troff/input.cc Wed Jun 7 21:50:37 2000 -@@ -4404,12 +4406,28 @@ +--- groff-1.19.1/src/roff/troff/input.cpp.safer 2004-05-05 18:41:58.000000000 +0200 ++++ groff-1.19.1/src/roff/troff/input.cpp 2005-01-12 13:27:33.947740912 +0100 +@@ -5444,20 +5444,35 @@ void source() + if (nm.is_null()) + skip_line(); else { ++ char cbuf[PATH_MAX], * cwd; ++ char pbuf[PATH_MAX], * path; ++ struct stat st; ++ while (!tok.newline() && !tok.eof()) tok.next(); - errno = 0; -- FILE *fp = fopen(nm.contents(), "r"); +- FILE *fp = include_search_path.open_file_cautious(nm.contents()); - if (fp) - input_stack::push(new file_iterator(fp, nm.contents())); - else - error("can't open `%1': %2", nm.contents(), strerror(errno)); -+ char cbuf[PATH_MAX], * cwd; -+ char pbuf[PATH_MAX], * path; -+ struct stat st; + + if ((cwd = realpath(".", cbuf)) == NULL) + error("realpath on `%1' failed: %2", ".", strerror(errno)); @@ -35,3 +38,9 @@ tok.next(); } } + +-// like .so but use popen() +- + void pipe_source() + { + if (safer_flag) { diff --git a/groff-1.18-gzip.patch b/groff-1.18-gzip.patch index 3d14ff0..96a7483 100644 --- a/groff-1.18-gzip.patch +++ b/groff-1.18-gzip.patch @@ -1,5 +1,5 @@ ---- groff-1.18/src/roff/troff/Makefile.sub.hugo 2002-05-03 00:33:21.000000000 +0200 -+++ groff-1.18/src/roff/troff/Makefile.sub 2002-11-04 21:30:09.000000000 +0100 +--- groff-1.19.1/src/roff/troff/Makefile.sub.gzip 2004-01-06 23:49:05.000000000 +0100 ++++ groff-1.19.1/src/roff/troff/Makefile.sub 2005-01-12 13:49:11.542476528 +0100 @@ -1,6 +1,6 @@ PROG=troff$(EXEEXT) MAN1=troff.n @@ -7,10 +7,10 @@ +XLIBS=-lz $(LIBGROFF) MLIB=$(LIBM) OBJS=\ - env.o \ ---- groff-1.18/src/roff/troff/input.cc.hugo 2002-11-04 21:30:09.000000000 +0100 -+++ groff-1.18/src/roff/troff/input.cc 2002-11-04 21:36:13.000000000 +0100 -@@ -42,6 +42,8 @@ + dictionary.$(OBJEXT) \ +--- groff-1.19.1/src/roff/troff/input.cpp.gzip 2005-01-12 13:49:11.516480480 +0100 ++++ groff-1.19.1/src/roff/troff/input.cpp 2005-01-12 13:57:40.615085728 +0100 +@@ -41,6 +41,8 @@ Foundation, 59 Temple Place - Suite 330, #include "nonposix.h" @@ -19,7 +19,7 @@ #ifdef NEED_DECLARATION_PUTENV extern "C" { int putenv(const char *); -@@ -217,6 +219,130 @@ +@@ -190,6 +192,130 @@ void restore_escape_char() skip_line(); } @@ -150,7 +150,7 @@ class input_iterator { public: input_iterator(); -@@ -236,7 +362,7 @@ +@@ -209,7 +335,7 @@ private: virtual int get_location(int, const char **, int *) { return 0; } virtual void backtrace() {} virtual int set_location(const char *, int) { return 0; } @@ -159,7 +159,7 @@ virtual void shift(int) {} virtual int is_boundary() {return 0; } virtual int internal_level() { return 0; } -@@ -277,7 +403,7 @@ +@@ -250,7 +376,7 @@ public: }; class file_iterator : public input_iterator { @@ -168,7 +168,7 @@ int lineno; const char *filename; int popened; -@@ -286,7 +412,9 @@ +@@ -259,7 +385,9 @@ class file_iterator : public input_itera enum { BUF_SIZE = 512 }; unsigned char buf[BUF_SIZE]; void close(); @@ -178,7 +178,7 @@ file_iterator(FILE *, const char *, int = 0); ~file_iterator(); int fill(node **); -@@ -294,18 +422,30 @@ +@@ -267,18 +395,30 @@ public: int get_location(int, const char **, int *); void backtrace(); int set_location(const char *, int); @@ -213,7 +213,7 @@ } } -@@ -316,6 +456,8 @@ +@@ -289,6 +429,8 @@ file_iterator::~file_iterator() void file_iterator::close() { @@ -222,7 +222,7 @@ if (fp == stdin) clearerr(stdin); #ifndef POPEN_MISSING -@@ -324,6 +466,7 @@ +@@ -297,6 +439,7 @@ void file_iterator::close() #endif /* not POPEN_MISSING */ else fclose(fp); @@ -230,7 +230,7 @@ } int file_iterator::is_file() -@@ -331,7 +474,7 @@ +@@ -304,7 +447,7 @@ int file_iterator::is_file() return 1; } @@ -239,7 +239,7 @@ { close(); filename = s; -@@ -354,7 +497,7 @@ +@@ -327,7 +470,7 @@ int file_iterator::fill(node **) ptr = p; unsigned char *e = p + BUF_SIZE; while (p < e) { @@ -248,7 +248,7 @@ if (c == EOF) break; if (invalid_input_char(c)) -@@ -381,13 +524,13 @@ +@@ -354,13 +497,13 @@ int file_iterator::fill(node **) int file_iterator::peek() { @@ -265,7 +265,7 @@ return c; } -@@ -433,7 +576,7 @@ +@@ -406,7 +549,7 @@ public: static int set_location(const char *, int); static void backtrace(); static void backtrace_all(); @@ -274,7 +274,7 @@ static void end_file(); static void shift(int n); static void add_boundary(); -@@ -605,7 +748,7 @@ +@@ -583,7 +726,7 @@ int input_stack::set_location(const char return 0; } @@ -283,22 +283,22 @@ { input_iterator **pp; for (pp = ⊤ *pp != &nil_iterator; pp = &(*pp)->next) -@@ -691,10 +834,11 @@ +@@ -669,10 +812,11 @@ void next_file() input_stack::end_file(); else { errno = 0; -- FILE *fp = fopen(nm.contents(), "r"); +- FILE *fp = include_search_path.open_file_cautious(nm.contents()); - if (!fp) + opaque_fp *fp = new opaque_fp(nm.contents(), "r"); + if (!fp->active()) { -+ delete fp; ++ delete fp; error("can't open `%1': %2", nm.contents(), strerror(errno)); - else + } else input_stack::next_file(fp, nm.contents()); } tok.next(); -@@ -5372,11 +5516,12 @@ +@@ -5463,11 +5607,12 @@ void source() error("won't source non-file `%1' without -U flag", path); else { errno = 0; @@ -315,7 +315,7 @@ } tok.next(); } -@@ -6822,16 +6967,18 @@ +@@ -6856,16 +7001,18 @@ void macro_source() static void process_input_file(const char *name) { @@ -328,11 +328,11 @@ } else { errno = 0; -- fp = fopen(name, "r"); +- fp = include_search_path.open_file_cautious(name); - if (!fp) + fp = new opaque_fp(name, "r", OPQ_FP_GUESS); + if (!fp->active()) { -+ delete fp; ++ delete fp; fatal("can't open `%1': %2", name, strerror(errno)); + } } diff --git a/groff-1.18-nohtml.patch b/groff-1.18-nohtml.patch index 313514b..fe338d5 100644 --- a/groff-1.18-nohtml.patch +++ b/groff-1.18-nohtml.patch @@ -1,6 +1,6 @@ ---- groff-1.18/doc/Makefile.sub.nohtml 2002-06-14 17:18:34.000000000 +0200 -+++ groff-1.18/doc/Makefile.sub 2002-08-06 13:46:19.000000000 +0200 -@@ -54,11 +54,9 @@ +--- groff-1.19.1/doc/Makefile.sub.nohtml 2004-03-05 10:52:57.000000000 +0100 ++++ groff-1.19.1/doc/Makefile.sub 2005-01-12 13:39:54.345183392 +0100 +@@ -59,14 +59,11 @@ meintro.ps \ pic.ps @@ -8,14 +8,18 @@ - pic.html +HTMLDOCFILES= +-HTMLDOCFILESALL=\ +- pic*.html ++HTMLDOCFILESALL= + -HTMLDOCIMAGEFILES=\ - pic* +HTMLDOCIMAGEFILES= EXAMPLEFILES=\ webpage.ms \ -@@ -71,11 +69,9 @@ - gnu.png \ +@@ -77,11 +74,9 @@ + webpage.ps \ grnexmpl.ps -HTMLEXAMPLEFILES=\ @@ -28,7 +32,7 @@ imagedir=img htmldocimagedir=$(htmldocdir)/$(imagedir) -@@ -109,7 +105,7 @@ +@@ -120,7 +115,7 @@ all: groff $(PROCESSEDDOCFILES) prepare_examples \ @@ -37,9 +41,9 @@ html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES) -@@ -131,7 +127,7 @@ +@@ -148,7 +143,7 @@ - distfiles: groff + distfiles: groff gnu.eps gnu.png -install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \ +install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) \ diff --git a/groff-1.18-pfbtops_cpp.patch b/groff-1.18-pfbtops_cpp.patch index 270b26f..28ed175 100644 --- a/groff-1.18-pfbtops_cpp.patch +++ b/groff-1.18-pfbtops_cpp.patch @@ -1,6 +1,6 @@ ---- groff-1.18/Makefile.in.sopwith 2002-10-04 17:10:56.000000000 -0400 -+++ groff-1.18/Makefile.in 2002-10-04 17:11:09.000000000 -0400 -@@ -422,8 +422,9 @@ +--- groff-1.19.1/Makefile.in.pfbtops_cpp 2004-04-07 17:33:39.000000000 +0200 ++++ groff-1.19.1/Makefile.in 2005-01-12 13:46:40.242477624 +0100 +@@ -464,8 +464,9 @@ src/utils/lookbib \ src/utils/indxbib \ src/utils/lkbib \ @@ -9,6 +9,6 @@ + src/utils/addftinfo \ + src/utils/pfbtops +CPROGDIRS= - PROGDIRS=$(CCPROGDIRS) $(CPROGDIRS) + PROGDEPDIRS=arch/misc + PROGDIRS=$(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) DEVDIRS=\ - font/devps \ diff --git a/groff-1.18.1-8bit.patch b/groff-1.18.1-8bit.patch deleted file mode 100644 index c98f5c6..0000000 --- a/groff-1.18.1-8bit.patch +++ /dev/null @@ -1,17 +0,0 @@ -2002-10-11 Ruslan Ermilov - - * src/roff/troff/env.cc (hyphen_trie::read_patterns_file): Add - cast to `unsigned char' to properly read patterns with 8bit - characters. - ---- groff-1.18.1/src/roff/troff/env.cc -+++ groff-1.18.1/src/roff/troff/env.cc -@@ -3924,7 +3924,7 @@ - if (i > 0) { - if (have_patterns || final_pattern || traditional) { - for (int j = 0; j < i; j++) -- buf[j] = hpf_code_table[buf[j]]; -+ buf[j] = hpf_code_table[(unsigned char)buf[j]]; - insert_pattern(buf, i, num); - final_pattern = 0; - } diff --git a/groff-1.18.1-devutf8.patch b/groff-1.18.1-devutf8.patch index d0109cf..379a92e 100644 --- a/groff-1.18.1-devutf8.patch +++ b/groff-1.18.1-devutf8.patch @@ -1,15 +1,3 @@ ---- groff-1.18.1/font/devutf8/M.proto.devutf8 2004-03-08 16:25:52.000000000 +0100 -+++ groff-1.18.1/font/devutf8/M.proto 2004-03-08 17:02:40.265336984 +0100 -@@ -1,6 +1,6 @@ - name M - internalname 4 --spacewidth 48 -+spacewidth 24 - charset --u2E00..u9FFF 48 0 --uFF00..uFFEF 48 0 -+u0100..u07FF 24 0 -+u0800..uFFFF 48 0 --- groff-1.18.1/font/devutf8/DESC.proto.devutf8 2004-03-08 16:25:52.000000000 +0100 +++ groff-1.18.1/font/devutf8/DESC.proto 2004-03-08 16:25:53.000000000 +0100 @@ -3,10 +3,7 @@ diff --git a/groff-1.18.1-fix15.patch b/groff-1.18.1-fix15.patch deleted file mode 100644 index 5a9fa64..0000000 --- a/groff-1.18.1-fix15.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- groff-1.18.1/src/libs/libgroff/encoding.cc.fix15 2004-03-08 16:13:15.825000416 +0100 -+++ groff-1.18.1/src/libs/libgroff/encoding.cc 2004-03-08 16:14:41.451983136 +0100 -@@ -384,21 +384,10 @@ - } - /* otherwise */ - #if HAVE_LANGINFO_CODESET -- charset = nl_langinfo(CODESET); --#else -- charset = strchr(locale, '.'); -- if (charset) -- ++charset; -- else -- charset = ""; -+ locale = nl_langinfo(CODESET); - #endif -- if (strncmp(locale, "ja", 2) == 0) { -- select_input_encoding_handler(charset); -- select_output_encoding_handler(charset); -- } else if ((!device || strcmp(device, "ascii8") == 0)) { -- select_input_encoding_handler(NULL); -- select_output_encoding_handler(NULL); -- } -+ select_input_encoding_handler(locale); -+ select_output_encoding_handler(locale); - #endif - return; - } diff --git a/groff-1.18.1-fixminus.patch b/groff-1.18.1-fixminus.patch index 0ea1e99..1b25055 100644 --- a/groff-1.18.1-fixminus.patch +++ b/groff-1.18.1-fixminus.patch @@ -1,9 +1,9 @@ ---- groff-1.18.1/font/devutf8/R.proto.fixminus 2003-02-03 14:19:47.000000000 +0100 -+++ groff-1.18.1/font/devutf8/R.proto 2003-02-03 14:20:06.000000000 +0100 -@@ -285,7 +285,7 @@ - +h 24 0 0x03D1 - +f 24 0 0x03D5 +--- groff-1.19.1/font/devutf8/R.proto.fixminus 2003-12-28 09:42:31.000000000 +0100 ++++ groff-1.19.1/font/devutf8/R.proto 2005-01-12 14:00:15.628520104 +0100 +@@ -405,7 +405,7 @@ + *f 24 0 0x03D5 +p 24 0 0x03D6 + +e 24 0 0x03F5 -- 24 0 0x2010 +- 24 0 0x002D hy " diff --git a/groff-1.18.1-gzext.patch b/groff-1.18.1-gzext.patch index d9ea585..3ab3aac 100644 --- a/groff-1.18.1-gzext.patch +++ b/groff-1.18.1-gzext.patch @@ -1,11 +1,16 @@ ---- groff-1.18.1/src/roff/troff/input.cc.gzext 2003-02-10 18:32:00.000000000 +0100 -+++ groff-1.18.1/src/roff/troff/input.cc 2003-02-10 18:33:18.000000000 +0100 -@@ -5487,12 +5487,16 @@ +--- groff-1.19.1/src/roff/troff/input.cpp.gzext 2005-01-12 14:17:15.469480712 +0100 ++++ groff-1.19.1/src/roff/troff/input.cpp 2005-01-12 14:22:57.666458864 +0100 +@@ -5590,16 +5590,20 @@ void source() + else { char cbuf[PATH_MAX], * cwd; char pbuf[PATH_MAX], * path; - struct stat st; + char tmp[PATH_MAX]; + struct stat st; + + snprintf(tmp, PATH_MAX, "%s.gz", nm.contents()); ++ + while (!tok.newline() && !tok.eof()) + tok.next(); if ((cwd = realpath(".", cbuf)) == NULL) error("realpath on `%1' failed: %2", ".", strerror(errno)); @@ -13,9 +18,8 @@ - error("realpath on `%1' failed: %2", nm.contents(), strerror(errno)); - else if (safer_flag && strncmp(cwd, path, strlen(cwd))) + else if ((path = realpath(nm.contents(), pbuf)) == NULL && -+ (path = realpath(tmp, pbuf)) == NULL) -+ { -+ error("realpath on `%1' failed: %3", nm.contents(), strerror(errno)); ++ (path = realpath(tmp, pbuf)) == NULL) { ++ error("realpath on `%1' failed: %3", nm.contents(), strerror(errno)); + } else if (safer_flag && strncmp(cwd, path, strlen(cwd))) error("won't source `%1' outside of `%2' without -U flag", path, cwd); else if (stat(path, &st) < 0) diff --git a/groff-1.18.1-korean.patch b/groff-1.18.1-korean.patch index 7dea1fc..eca32b3 100644 --- a/groff-1.18.1-korean.patch +++ b/groff-1.18.1-korean.patch @@ -1,38 +1,44 @@ ---- groff-1.18.1/src/roff/nroff/nroff.sh.orig 2003-02-06 19:37:17.000000000 +0900 -+++ groff-1.18.1/src/roff/nroff/nroff.sh 2003-02-06 19:38:34.000000000 +0900 -@@ -14,6 +14,8 @@ +--- groff-1.19.1/src/roff/nroff/nroff.sh.korean 2004-04-06 16:10:32.000000000 +0200 ++++ groff-1.19.1/src/roff/nroff/nroff.sh 2005-01-12 14:15:39.714037752 +0100 +@@ -12,6 +12,10 @@ + T=-Tlatin1 ;; + IBM-1047) T=-Tcp1047 ;; - EUC-JP) - T=-Tnippon ;; ++ EUC-JP) ++ T=-Tnippon ;; + EUC-KR) + T=-Tkorean ;; *) case "${LC_ALL-${LC_CTYPE-${LANG}}}" in *.UTF-8) -@@ -24,6 +26,8 @@ +@@ -20,6 +24,10 @@ + T=-Tlatin1 ;; + *.IBM-1047) T=-Tcp1047 ;; - ja_JP.ujis | ja_JP.eucJP) - T=-Tnippon ;; ++ ja_JP.ujis | ja_JP.eucJP) ++ T=-Tnippon ;; + ko_KR.eucKR) + T=-Tkorean ;; *) case "$LESSCHARSET" in utf-8) -@@ -34,6 +38,8 @@ +@@ -28,6 +36,10 @@ + T=-Tlatin1 ;; + cp1047) T=-Tcp1047 ;; - japanese) - T=-Tnippon ;; -+ ko) -+ T=-Tkorean ;; ++ japanese) ++ T=-Tnippon ;; ++ ko) ++ T=-Tkorean ;; *) - T=-Tascii8 ;; + T=-Tascii ;; esac ;; -@@ -58,7 +64,7 @@ +@@ -52,7 +64,7 @@ exit 1 ;; - -[iptSUC] | -[mrno]*) + -[iptSUC] | -[dmrno]*) opts="$opts $1" ;; -- -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047 | -Tascii8 | -Tnippon) -+ -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047 | -Tascii8 | -Tnippon | -Tkorean) +- -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047) ++ -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047 | -Tnippon | -Tkorean) T=$1 ;; -T*) # ignore other devices diff --git a/groff-1.18.1.1-grn.patch b/groff-1.18.1.1-grn.patch deleted file mode 100644 index 45e4b30..0000000 --- a/groff-1.18.1.1-grn.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- groff-1.18.1.1/src/preproc/grn/hdb.cc.grn 2002-10-07 06:42:55.000000000 +0200 -+++ groff-1.18.1.1/src/preproc/grn/hdb.cc 2004-09-16 10:23:42.394486378 +0200 -@@ -115,7 +115,6 @@ - type = DBGetType(string); /* interpret element type */ - if (type < 0) { /* no more data */ - done = TRUE; -- (void) fclose(file); - } else { - #ifdef UW_FASTSCAN - (void) xscanf(file, &x, &y); /* always one point */ diff --git a/groff-xlibs.patch b/groff-xlibs.patch index aa72c29..f319022 100644 --- a/groff-xlibs.patch +++ b/groff-xlibs.patch @@ -1,12 +1,12 @@ ---- groff-1.18.1/Makefile.ccpg.sopwith Mon Feb 10 08:33:21 2003 -+++ groff-1.18.1/Makefile.ccpg Mon Feb 10 08:54:00 2003 +--- groff-1.19.1/Makefile.ccpg.xlibs 2003-04-12 16:07:05.000000000 +0200 ++++ groff-1.19.1/Makefile.ccpg 2005-01-12 14:24:58.349112312 +0100 @@ -8,7 +8,7 @@ all: $(PROG) $(MANPAGES) -$(PROG): $(OBJS) $(XLIBS) +$(PROG): $(OBJS) - $(LINK.cc) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB) + $(LINK.cpp) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB) install_bin: install_prog @@ -28,6 +28,6 @@ @@ -16,4 +16,4 @@ -$(PROG).pure: $(OBJS) $(XLIBS) +$(PROG).pure: $(OBJS) $(PURIFY) $(PURIFYCCFLAGS) \ - $(LINK.cc) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB) + $(LINK.cpp) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB) diff --git a/groff.spec b/groff.spec index d4a78ee..4d038cc 100644 --- a/groff.spec +++ b/groff.spec @@ -2,32 +2,27 @@ Summary: A document formatting system. Name: groff -Version: 1.18.1.1 -Release: 5 +Version: 1.19.1 +Release: 1 License: GPL Group: Applications/Publishing -Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz +Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.bz2 Source3: mandocj.tar.gz Source4: man-pages-ja-GNU_groff-20000115.tar.gz Source6: hyphen.cs Source7: nroff Patch1: groff-1.16-safer.patch -Patch3: groff_1.18.1-15.diff -Patch4: groff-1.18-info.patch -Patch5: groff-1.18-nohtml.patch -Patch6: groff-1.18-pfbtops_cpp.patch -Patch7: groff-1.18-gzip.patch -Patch9: groff-1.18.1-fixminus.patch -Patch11: groff-1.18.1-8bit.patch -Patch12: groff-1.18.1-korean.patch -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 -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 +Patch2: groff-1.18-info.patch +Patch3: groff-1.18-nohtml.patch +Patch4: groff-1.18-pfbtops_cpp.patch +Patch5: groff-1.18-gzip.patch +Patch6: groff-1.18.1-fixminus.patch +Patch7: groff-1.18.1-korean.patch +Patch8: groff-1.18.1-gzext.patch +Patch9: groff-xlibs.patch +Patch10: groff-1.18.1.1-revision.patch +Patch11: groff-1.18.1.1-do_char.patch +Patch12: groff-1.18.1.1-tempfile.patch URL: ftp://ftp.gnu.org/gnu/groff/ Requires: mktemp @@ -76,23 +71,19 @@ System display. %prep %setup -q -a 4 -%patch1 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch9 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -b .gzext -%patch14 -p1 -%patch15 -p1 -b .fix9 -%patch16 -p1 -b .devutf8 -%patch17 -p1 -b .revision -%patch18 -p1 -b .do_char -%patch19 -p1 -b .grn -%patch20 -p1 -b .tempfile +%patch1 -p1 -b .safer +%patch2 -p1 -b .infopatch +%patch3 -p1 -b .nohtml +%patch4 -p1 -b .pfbtops_cpp +%patch5 -p1 -b .gzip +%patch6 -p1 -b .fixminus +%patch7 -p1 -b .korean +%patch8 -p1 -b .gzext +%patch9 -p1 -b .xlibs +%patch10 -p1 -b .revision +%patch11 -p1 -b .do_char +%patch12 -p1 -b .tempfile + for i in contrib/mm/{groff_mm,groff_mmse,mmroff}.man \ src/devices/grolbp/grolbp.man; do iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_" @@ -101,7 +92,6 @@ done %build PATH=$PATH:%{_prefix}/X11R6/bin -#autoconf %configure --enable-japanese --enable-multibyte make (cd doc && makeinfo groff.texinfo) @@ -203,6 +193,12 @@ fi %endif %changelog +* Wed Jan 12 2005 Jindrich Novy 1.19.1-1 +- update to groff 1.19.1 +- drop 8bit, fix15, devutf8, grn patches +- sync the rest of patches with current release +- spec cleanup + * Wed Nov 24 2004 Miloslav Trmac - 1.18.1.1-5 - Convert also mmroff.1 to UTF-8 diff --git a/sources b/sources index b1638ef..eafba7e 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ 511dbd64b67548c99805f1521f82cc5e groff-1.18.1.1.tar.gz 9bbf9b74fd587d248e17543bda4ce5de man-pages-ja-GNU_groff-20000115.tar.gz e5d7f3273b4d53033723fcd2654d980c mandocj.tar.gz +88239a9aa668235ac82c34bcdfc4e83a groff-1.19.1.tar.bz2