rpms/xdvik/devel xdvik-22.84.14-zerofix.patch, NONE, 1.1 xdvik.spec, 1.26, 1.27 texlive-2007-xprint.patch, 1.1, NONE

[Jonathan G. Underwood]

Author: jgu

Update of /cvs/extras/rpms/xdvik/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22025

Modified Files:
	xdvik.spec 
Added Files:
	xdvik-22.84.14-zerofix.patch 
Removed Files:
	texlive-2007-xprint.patch 
Log Message:
* Wed Nov 12 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.14-4
- Add patch to fix zero key handling (BZ 470942)
- Remove texlive-2007-xprint.patch which actually hasn't been applied during
  22.84.14 packaging


xdvik-22.84.14-zerofix.patch:

--- NEW FILE xdvik-22.84.14-zerofix.patch ---
diff -up xdvik-22.84.14/texk/xdvik/texmf/XDvi.zerofix xdvik-22.84.14/texk/xdvik/texmf/XDvi
--- xdvik-22.84.14/texk/xdvik/texmf/XDvi.zerofix	2008-11-12 00:09:46.000000000 +0000
+++ xdvik-22.84.14/texk/xdvik/texmf/XDvi	2008-11-12 00:10:02.000000000 +0000
@@ -368,3 +368,6 @@ Ctrl<Btn5Down>:set-shrink-factor(-)\n\
 !!!-------------- used for internal checking - DO NOT CHANGE THIS! --------------
 !!!------------------------------------------------------------------------------
 *appDefaultsFileVersion: 20030303
+
+*mainTranslations: #override\n\
+	<Key>0: digit(0)


Index: xdvik.spec
===================================================================
RCS file: /cvs/extras/rpms/xdvik/devel/xdvik.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xdvik.spec	12 Oct 2008 00:59:43 -0000	1.26
+++ xdvik.spec	12 Nov 2008 00:23:27 -0000	1.27
@@ -7,7 +7,7 @@
 Summary:        An X viewer for DVI files
 Name:           xdvik
 Version:        22.84.14
-Release:        3%{?dist}
+Release:        4%{?dist}
 Url:            http://xdvi.sourceforge.net/
 # encodings.c is GPLv2+ and LGPL and MIT
 # read-mapfile.c tfmload.c are from dvips
@@ -41,8 +41,11 @@
 Source100:      xdvi-ptex.map
 %endif
 
-# This patch not pushed upstream. Unclear if it's actually still needed.
-Patch1:         texlive-2007-xprint.patch
+# Fix handling of the 0 key. See:
+# http://sourceforge.net/tracker/index.php?func=detail&aid=2067614&group_id=23164&atid=377580
+# https://bugzilla.redhat.com/show_bug.cgi?id=470942
+# Fixed upstream post 22.84.14 ?
+Patch0:		xdvik-22.84.14-zerofix.patch
 
 %if %{with japanese}
 # Japanese patch for xdvi from http://sourceforge.jp/projects/xdvi/
@@ -71,6 +74,9 @@
 %prep
 %setup -q
 
+# Fix handling of zero key
+%patch0 -p1 -b .zerofix
+
 # Allow Xaw3d enabled build of xdvi
 sed -i 's|/Xaw/|/Xaw3d/|' texk/xdvik/gui/*.[ch] texk/xdvik/*.[ch]
 
@@ -239,6 +245,11 @@
 %endif
 
 %changelog
+* Wed Nov 12 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.14-4
+- Add patch to fix zero key handling (BZ 470942)
+- Remove texlive-2007-xprint.patch which actually hasn't been applied during
+  22.84.14 packaging
+
 * Sun Oct 12 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.14-3
 - Fix package build breakage
 


--- texlive-2007-xprint.patch DELETED ---