rpms/groff/devel groff.spec,1.50,1.51 nroff,1.4,1.5

[Marcela Mašláňová (mmaslano)]

Author: mmaslano

Update of /cvs/pkgs/rpms/groff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8624

Modified Files:
	groff.spec nroff 
Log Message:
Changed nroff script again.



Index: groff.spec
===================================================================
RCS file: /cvs/pkgs/rpms/groff/devel/groff.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- groff.spec	16 Aug 2007 11:26:13 -0000	1.50
+++ groff.spec	16 Aug 2007 14:11:35 -0000	1.51
@@ -3,7 +3,7 @@
 Summary: A document formatting system
 Name:	groff
 Version: 1.18.1.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Publishing
 URL: http://groff.ffii.org
@@ -233,7 +233,8 @@
 %endif
 
 %changelog
-* Thu Aug 16 2007 Marcela Maslanova <mmaslano at redhat.com> - 1.18.1.4-6
+* Thu Aug 16 2007 Marcela Maslanova <mmaslano at redhat.com> - 1.18.1.4-7
+- rebuild
 - another encoding are print correct with nroff
 - Resolves: rhbz#251064
 


Index: nroff
===================================================================
RCS file: /cvs/pkgs/rpms/groff/devel/nroff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nroff	16 Aug 2007 11:26:13 -0000	1.4
+++ nroff	16 Aug 2007 14:11:35 -0000	1.5
@@ -4,8 +4,7 @@
 prog="$0"
 charset_in=iso-8859-1
 charset_out=`locale charmap 2>/dev/null`
-opts=
-othercoding=0
+opts="-mtty-char -Tutf8"
 
 # Default device.
 # First try the "locale charmap" command, because it's most reliable.
@@ -51,6 +50,7 @@
     esac ;;
 esac
 
+
 for i
 do
   case $1 in
@@ -67,7 +67,7 @@
     -[iptSUC] | -[mrno]*)
       opts="$opts $1" ;;
     -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047 | -Tascii8 | -Tnippon | -Tkorean)
-      othercoding=1
+      opts=
       T=$1 ;;
     -T*)
       # ignore other devices
@@ -120,9 +120,6 @@
 
 # This shell script is intended for use with man, so warnings are
 # probably not wanted.  Also load nroff-style character definitions.
-if [ "$othercoding" == 0 ]; then
-	opts="-mtty-char -Tutf8"
-fi
 
 if [ $charset_in = utf-8 -a $charset_out = UTF-8 ]; then
   if [ $TMPFILE = buf ]; then