rpms/xdvik/F-9 xdvik-22.84.14-pxdvi.patch, 1.1, 1.2 xdvik.spec, 1.18, 1.19

[Jonathan G. Underwood]

Author: jgu

Update of /cvs/extras/rpms/xdvik/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31285

Modified Files:
	xdvik-22.84.14-pxdvi.patch xdvik.spec 
Log Message:
* Sun Oct 12 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.14-2
- Fix previous spec file changelog entry
- Fix Japanese font handling (BZ 465391) by reworking pxdvi patch


xdvik-22.84.14-pxdvi.patch:

Index: xdvik-22.84.14-pxdvi.patch
===================================================================
RCS file: /cvs/extras/rpms/xdvik/F-9/xdvik-22.84.14-pxdvi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xdvik-22.84.14-pxdvi.patch	19 Jul 2008 13:29:57 -0000	1.1
+++ xdvik-22.84.14-pxdvi.patch	12 Oct 2008 00:42:26 -0000	1.2
@@ -1,6 +1,8 @@
 diff -up xdvik-22.84.14/texk/configure.in.pxdvi xdvik-22.84.14/texk/configure.in
+diff -up xdvik-22.84.14/texk/configure.in.pxdvi xdvik-22.84.14/texk/configure.in
+diff -up xdvik-22.84.14/texk/configure.in.pxdvi xdvik-22.84.14/texk/configure.in
 --- xdvik-22.84.14/texk/configure.in.pxdvi	2008-05-03 20:45:04.000000000 +0100
-+++ xdvik-22.84.14/texk/configure.in	2008-07-17 00:22:02.000000000 +0100
++++ xdvik-22.84.14/texk/configure.in	2008-10-12 00:40:48.000000000 +0100
 @@ -52,7 +52,7 @@ fi
  PKGS='
    bibtex8 cjkutils detex devnag dtl dvi2tty dvidvi dviljk dvipdfm dvipsk gsftopk 
@@ -10,9 +12,21 @@
  '
  
  ESUBDIRS=
+diff -up xdvik-22.84.14/texk/pxdvik/main.c.pxdvi xdvik-22.84.14/texk/pxdvik/main.c
+--- xdvik-22.84.14/texk/pxdvik/main.c.pxdvi	2008-10-12 00:40:48.000000000 +0100
++++ xdvik-22.84.14/texk/pxdvik/main.c	2008-10-12 00:40:48.000000000 +0100
+@@ -1177,7 +1177,7 @@ main(int argc, char **argv)
+ 
+     kpse_init_prog("XDVI", resource.pixels_per_inch, resource.mfmode, resource.alt_font);
+     
+-    kpse_set_program_name(argv[0], "xdvi");
++    kpse_set_program_name(argv[0], "pxdvi");
+ 
+     
+     if (globals.debug & DBG_EXPAND) {
 diff -up xdvik-22.84.14/texk/pxdvik/Makefile.in.pxdvi xdvik-22.84.14/texk/pxdvik/Makefile.in
---- xdvik-22.84.14/texk/pxdvik/Makefile.in.pxdvi	2008-07-17 00:22:02.000000000 +0100
-+++ xdvik-22.84.14/texk/pxdvik/Makefile.in	2008-07-17 00:26:37.000000000 +0100
+--- xdvik-22.84.14/texk/pxdvik/Makefile.in.pxdvi	2008-10-12 00:40:48.000000000 +0100
++++ xdvik-22.84.14/texk/pxdvik/Makefile.in	2008-10-12 01:26:49.000000000 +0100
 @@ -10,6 +10,9 @@ ac_include ../make/cross.mk
  
  all_subdirs = gui tests
@@ -48,7 +62,7 @@
  	    true; \
  	fi
 -	$(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(texmf)/xdvi/
-+	$(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(texmf)/pxdvi/
++	$(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(texmf)/fonts/map/pxdvi/xdvi-ptex.map
  	if test ! -f $(PTEXMAP); then \
  	  $(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(PTEXMAP); \
  	fi
@@ -79,8 +93,8 @@
    MOTIF
  version_files = xdvi.c
 diff -up xdvik-22.84.14/texk/pxdvik/texmf/XDvi.pxdvi xdvik-22.84.14/texk/pxdvik/texmf/XDvi
---- xdvik-22.84.14/texk/pxdvik/texmf/XDvi.pxdvi	2008-07-17 00:22:02.000000000 +0100
-+++ xdvik-22.84.14/texk/pxdvik/texmf/XDvi	2008-07-17 00:22:02.000000000 +0100
+--- xdvik-22.84.14/texk/pxdvik/texmf/XDvi.pxdvi	2008-10-12 00:40:48.000000000 +0100
++++ xdvik-22.84.14/texk/pxdvik/texmf/XDvi	2008-10-12 00:40:48.000000000 +0100
 @@ -137,7 +137,7 @@ Ctrl<Btn5Down>:set-shrink-factor(-)\n\
  !!!------------------------------------------------------------------------------
  !!! note: when i18n'ed, *font and *fontSet should have same size of font
@@ -92,7 +106,7 @@
  xdviSelFile*international: false
 diff -up xdvik-22.84.14/texk/pxdvik/xdvi-sh.in.pxdvi xdvik-22.84.14/texk/pxdvik/xdvi-sh.in
 --- xdvik-22.84.14/texk/pxdvik/xdvi-sh.in.pxdvi	2007-10-18 17:28:55.000000000 +0100
-+++ xdvik-22.84.14/texk/pxdvik/xdvi-sh.in	2008-07-17 00:22:02.000000000 +0100
++++ xdvik-22.84.14/texk/pxdvik/xdvi-sh.in	2008-10-12 00:40:48.000000000 +0100
 @@ -35,7 +35,7 @@ case "$#:$1" in
      NAMEOPT="-name $BASE_NAME";;
  esac


Index: xdvik.spec
===================================================================
RCS file: /cvs/extras/rpms/xdvik/F-9/xdvik.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xdvik.spec	19 Jul 2008 13:29:57 -0000	1.18
+++ xdvik.spec	12 Oct 2008 00:42:26 -0000	1.19
@@ -7,7 +7,7 @@
 Summary:        An X viewer for DVI files
 Name:           xdvik
 Version:        22.84.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Url:            http://xdvi.sourceforge.net/
 # encodings.c is GPLv2+ and LGPL and MIT
 # read-mapfile.c tfmload.c are from dvips
@@ -238,7 +238,11 @@
 %endif
 
 %changelog
-* Fri Jul 18 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-20
+* Sun Oct 12 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.14-2
+- Fix previous spec file changelog entry
+- Fix Japanese font handling (BZ 465391) by reworking pxdvi patch
+
+* Fri Jul 18 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.14-1
 - Update to version 22.84.14
 - Update Japanese patch to 22.84.14-j1.40
 - Rework patch allowing both normal and Japanese versions to be built