auto-import changelog data from groff-1.18.1-34.src.rpm

Mon Mar 08 2004 Thomas Woerner <twoerner@redhat.com> 1.18.1-34 - new debian groff patch: groff_1.18.1-15.diff - new fix for debian patch: groff-1.18.1-fix15.patch - fixed width in devutf8 font M: groff-1.18.1-devutf8.patch - removed iconv patch Mon Mar 01 2004 Thomas Woerner <twoerner@redhat.com> 1.18.1-33 - fixed nroff script: convert output to locale charmap Wed Feb 25 2004 Thomas Woerner <twoerner@redhat.com> 1.18.1-32 - fixed nroff script input (#116596) Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com> - rebuilt Mon Feb 09 2004 Adrian Havill <havill@redhat.com> - provide I18N version of nroff that accepts --legacy parameter (used by man-1.5m2-2) Thu Dec 18 2003 Thomas Woerner <twoerner@redhat.com> - fixed missing BuildRequires (#110574)
2004-09-09 05:56:32 +00:00 · 2004-09-09 05:56:32 +00:00 · 3568b1c0e2
commit 3568b1c0e2
parent 752cb86f68
5 changed files with 20257 additions and 17 deletions
--- a/groff-1.18.1-devutf8.patch
+++ b/groff-1.18.1-devutf8.patch
@ -1,14 +1,17 @@
--- groff-1.18.1/font/devutf8/M.proto.new_utf8	2003-08-06 13:49:19.000000000 +0200
-+++ groff-1.18.1/font/devutf8/M.proto	2003-08-06 13:54:51.000000000 +0200
-@@ -2,5 +2,4 @@
+--- 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 48
+spacewidth 24
 charset
 -u2E00..u9FFF 48 0
 -uFF00..uFFEF 48 0
-+u0100..uFFFF 48 0
--- groff-1.18.1/font/devutf8/DESC.proto.new_utf8	2003-08-06 13:49:19.000000000 +0200
-+++ groff-1.18.1/font/devutf8/DESC.proto	2003-08-06 13:53:20.000000000 +0200
+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 @@
 vert 40
 unitwidth 10
@ -22,3 +25,18 @@
 +fontset - M 0100..FFFF
 tcommand
 postpro grotty
+--- groff-1.18.1/font/devutf8/Makefile.sub.devutf8	2004-03-08 16:25:52.000000000 +0100
+++ groff-1.18.1/font/devutf8/Makefile.sub	2004-03-08 17:03:58.858389024 +0100
+@@ -25,11 +25,7 @@
+ M: M.proto
+ 	@echo Making M
+ 	@-rm -f M
+-	(wcharwidth=`expr $(RES) / $(CPI) \* 2` ; \
+-	  spacewidth=`expr $(RES) / $(CPI)` ; \
+-	  sed -e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$spacewidth/" \
+-	      -e "s/^u\\([0-9A-F]*\\)..u\\([0-9A-F]*\\) [0-9][0-9]*/u\\1..u\\2 $$wcharwidth/" \
+-	  $(srcdir)/M.proto > $@)
+	@cp M.proto M
+ 
+ G: M
+ 	@echo Making G
--- a/groff-1.18.1-fix15.patch
+++ b/groff-1.18.1-fix15.patch
@ -0,0 +1,27 @@
+--- 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;
+ }
--- a/groff.spec
+++ b/groff.spec
@ -3,35 +3,34 @@
 Summary: A document formatting system.
 Name: groff
 Version: 1.18.1
-Release: 29
-Copyright: GPL
+Release: 34
+License: GPL
 Group: Applications/Publishing
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
-# Japanese sources
 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-9.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
-Patch8: groff-1.18.1-multichar.patch
 Patch9: groff-1.18.1-fixminus.patch
-Patch10: groff-1.18.1-iconv.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-fix9.patch
+Patch15: groff-1.18.1-fix15.patch
 Patch16: groff-1.18.1-devutf8.patch
 URL: ftp://ftp.gnu.org/gnu/groff/
 Requires: mktemp
 Prereq: /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-root
 Obsoletes: groff-tools
-BuildRequires: netpbm-progs, zlib-devel
+Provides: nroff-i18n
+BuildRequires: netpbm-progs, zlib-devel, XFree86-devel, texinfo

 %description
 Groff is a document formatting system. Groff takes standard text and
@ -74,9 +73,7 @@ System display.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-#%patch8 -p1
 %patch9 -p1
-%patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1 -b .gzext
@ -146,6 +143,8 @@ find ${RPM_BUILD_ROOT}%{_prefix}/bin ${RPM_BUILD_ROOT}%{_mandir} -type f -o -typ

 install -m 644 %SOURCE6 $RPM_BUILD_ROOT/usr/share/groff/%version/tmac/hyphen.cs

+install -m 755 %SOURCE7 $RPM_BUILD_ROOT/usr/bin/nroff
+
 ln -sf doc.tmac $RPM_BUILD_ROOT/usr/share/groff/%version/tmac/docj.tmac
 # installed, but not packaged in rpm
 rm -fr $RPM_BUILD_ROOT/usr/share/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir
@ -186,6 +185,28 @@ fi
 %endif

 %changelog
+* Mon Mar  8 2004 Thomas Woerner <twoerner@redhat.com> 1.18.1-34
+- new debian groff patch: groff_1.18.1-15.diff
+- new fix for debian patch: groff-1.18.1-fix15.patch
+- fixed width in devutf8 font M: groff-1.18.1-devutf8.patch
+- removed iconv patch
+
+* Mon Mar  1 2004 Thomas Woerner <twoerner@redhat.com> 1.18.1-33
+- fixed nroff script: convert output to locale charmap
+
+* Wed Feb 25 2004 Thomas Woerner <twoerner@redhat.com> 1.18.1-32
+- fixed nroff script input (#116596)
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Mon Feb 09 2004 Adrian Havill <havill@redhat.com>
+- provide I18N version of nroff that accepts --legacy parameter
+  (used by man-1.5m2-2)
+
+* Thu Dec 18 2003 Thomas Woerner <twoerner@redhat.com>
+- fixed missing BuildRequires (#110574)
+
 * Tue Sep 23 2003 Florian La Roche <Florian.LaRoche@redhat.de>
 - allow compiling this without XFree86

--- a/groff_1.18.1-15.diff
+++ b/groff_1.18.1-15.diff
--- a/73
+++ b/73
@ -0,0 +1,73 @@
+#!/bin/bash
+# Emulate nroff with groff.
+
+prog="$0"
+charset_in=iso-8859-1
+charset_out=`locale charmap 2>/dev/null`
+opts=
+
+for i
+do
+  case $1 in
+    -c)
+      opts="$opts -P-c" ;;
+    -h)
+      opts="$opts -P-h" ;;
+    -[eq] | -s* | -u* | -T* )
+      # ignore these options
+      ;;
+    -[mrnoT])
+      echo $"option $1 requires an argument" >&2
+      exit 1 ;;
+    -[iptSUC] | -[mrno]*)
+      opts="$opts $1" ;;
+    -v | --version)
+      echo $"GNU nroff (groff) with Red Hat i18n/l10n support"
+      exit 0 ;;
+    --legacy)
+      shift
+      charset_in=$1 ;;
+    --help)
+      echo $"usage: $prog [-cChipt] [-mNAME] [-nNUM] [--legacy CHARSET] [-oLIST] [-rCN] [FILE...]"
+      exit 0 ;;
+    --)
+      shift
+      break ;;
+    -)
+      break ;;
+    -*)
+      echo $"$prog: invalid option $1" >&2
+      exit 1 ;;
+    *)
+      break ;;
+  esac
+  shift
+done
+
+TMPFILE=$(mktemp /tmp/man.XXXXXX)
+trap "rm -f $TMPFILE" 0 1 2 3 15
+
+cat ${1+"$@"} > ${TMPFILE}
+
+if iconv -f utf-8 -t utf-8 -o /dev/null ${TMPFILE} 2>/dev/null
+then
+  charset_in=utf-8  
+else
+  echo XXX
+  echo XXX $"WARNING: old character encoding and/or character set"
+  echo XXX
+fi
+
+# en_US is chosen arbitrarily; any UTF-8 locale should work
+export LC_ALL=en_US.UTF-8
+
+# This shell script is intended for use with man, so warnings are
+# probably not wanted.  Also load nroff-style character definitions.
+
+/usr/bin/iconv -f ${charset_in} -t utf-8 ${TMPFILE} | \
+    /usr/bin/groff -mtty-char -Tutf8 $opts 2>/dev/null | \
+    /usr/bin/iconv -f utf-8 -t ${charset_out}//translit
+
+rm -f ${TMPFILE}
+
+# eof