rpms/xdvik/devel xdvik-22.84.14-pxdvi.patch, 1.2, 1.3 xdvik.spec, 1.25, 1.26

[Jonathan G. Underwood]

Author: jgu

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

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-3
- Fix package build breakage


xdvik-22.84.14-pxdvi.patch:

Index: xdvik-22.84.14-pxdvi.patch
===================================================================
RCS file: /cvs/extras/rpms/xdvik/devel/xdvik-22.84.14-pxdvi.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xdvik-22.84.14-pxdvi.patch	12 Oct 2008 00:39:53 -0000	1.2
+++ xdvik-22.84.14-pxdvi.patch	12 Oct 2008 00:59:43 -0000	1.3
@@ -1,8 +1,10 @@
 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
+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-10-12 00:40:48.000000000 +0100
++++ xdvik-22.84.14/texk/configure.in	2008-10-12 01:55:37.000000000 +0100
 @@ -52,7 +52,7 @@ fi
  PKGS='
    bibtex8 cjkutils detex devnag dtl dvi2tty dvidvi dviljk dvipdfm dvipsk gsftopk 
@@ -13,8 +15,8 @@
  
  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
+--- xdvik-22.84.14/texk/pxdvik/main.c.pxdvi	2008-10-12 01:55:37.000000000 +0100
++++ xdvik-22.84.14/texk/pxdvik/main.c	2008-10-12 01:55:37.000000000 +0100
 @@ -1177,7 +1177,7 @@ main(int argc, char **argv)
  
      kpse_init_prog("XDVI", resource.pixels_per_inch, resource.mfmode, resource.alt_font);
@@ -25,8 +27,8 @@
      
      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-10-12 00:40:48.000000000 +0100
-+++ xdvik-22.84.14/texk/pxdvik/Makefile.in	2008-10-12 01:26:49.000000000 +0100
+--- xdvik-22.84.14/texk/pxdvik/Makefile.in.pxdvi	2008-10-12 01:55:37.000000000 +0100
++++ xdvik-22.84.14/texk/pxdvik/Makefile.in	2008-10-12 01:57:46.000000000 +0100
 @@ -10,6 +10,9 @@ ac_include ../make/cross.mk
  
  all_subdirs = gui tests
@@ -37,12 +39,13 @@
  CPP = @CPP@
  
  # Make `#include <X11/...>' and `-lX...' work.
-@@ -178,40 +181,40 @@ uninstall-exec:
+@@ -178,40 +181,41 @@ uninstall-exec:
  
  install-data: $(manpage).1 pixmaps/toolbar.xpm pixmaps/toolbar2.xpm
  	$(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) 
 -	$(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/xdvi/pixmaps
 +	$(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/pxdvi/pixmaps
++	$(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/fonts/map/pxdvi
  	$(INSTALL_DATA) $(manpage).1 $(man1dir)/$(manpage).$(manext)
  	rm -f $(man1dir)/o$(manpage).$(manext)
  	ln -s $(manpage).$(manext) $(man1dir)/o$(manpage).$(manext)
@@ -93,8 +96,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-10-12 00:40:48.000000000 +0100
-+++ xdvik-22.84.14/texk/pxdvik/texmf/XDvi	2008-10-12 00:40:48.000000000 +0100
+--- xdvik-22.84.14/texk/pxdvik/texmf/XDvi.pxdvi	2008-10-12 01:55:37.000000000 +0100
++++ xdvik-22.84.14/texk/pxdvik/texmf/XDvi	2008-10-12 01:55:37.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
@@ -106,7 +109,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-10-12 00:40:48.000000000 +0100
++++ xdvik-22.84.14/texk/pxdvik/xdvi-sh.in	2008-10-12 01:55:37.000000000 +0100
 @@ -35,7 +35,7 @@ case "$#:$1" in
      NAMEOPT="-name $BASE_NAME";;
  esac


Index: xdvik.spec
===================================================================
RCS file: /cvs/extras/rpms/xdvik/devel/xdvik.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xdvik.spec	12 Oct 2008 00:39:53 -0000	1.25
+++ xdvik.spec	12 Oct 2008 00:59:43 -0000	1.26
@@ -7,7 +7,7 @@
 Summary:        An X viewer for DVI files
 Name:           xdvik
 Version:        22.84.14
-Release:        2%{?dist}
+Release:        3%{?dist}
 Url:            http://xdvi.sourceforge.net/
 # encodings.c is GPLv2+ and LGPL and MIT
 # read-mapfile.c tfmload.c are from dvips
@@ -235,9 +235,13 @@
 %{_bindir}/pxdvi
 %{_bindir}/pxdvi-xaw3d
 %{_texmf_main}/pxdvi/
+%{_texmf_main}/fonts/map/pxdvi/
 %endif
 
 %changelog
+* Sun Oct 12 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.14-3
+- Fix package build breakage
+
 * 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