rpms/xdvik/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xdvik.spec, 1.13, 1.14

[Jonathan G. Underwood (jgu)]

Author: jgu

Update of /cvs/extras/rpms/xdvik/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15775

Modified Files:
	.cvsignore sources xdvik.spec 
Log Message:
* Sun Feb  3  2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-16
- Change directory copying logic such that we can use the upstream Japanese
  patch without modification



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xdvik/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Feb 2008 14:10:05 -0000	1.4
+++ .cvsignore	3 Feb 2008 22:12:10 -0000	1.5
@@ -1,2 +1,2 @@
 xdvik-22.84.13.tar.gz
-xdvik-22.84.13-j1.36.1.patch.gz
+xdvik-22.84.13-j1.36.patch.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xdvik/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Feb 2008 14:10:05 -0000	1.4
+++ sources	3 Feb 2008 22:12:10 -0000	1.5
@@ -1,2 +1,2 @@
 4d3d92381be42d7163e0f815f9cfb346  xdvik-22.84.13.tar.gz
-354b5df50807f673f463b192cc7763f0  xdvik-22.84.13-j1.36.1.patch.gz
+d4c68a340a81dc6cce353081476abb56  xdvik-22.84.13-j1.36.patch.gz


Index: xdvik.spec
===================================================================
RCS file: /cvs/extras/rpms/xdvik/devel/xdvik.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xdvik.spec	2 Feb 2008 23:12:11 -0000	1.13
+++ xdvik.spec	3 Feb 2008 22:12:10 -0000	1.14
@@ -8,7 +8,7 @@
 Summary:        An X viewer for DVI files
 Name:           xdvik
 Version:        22.84.13
-Release:        15%{?dist}
+Release:        16%{?dist}
 Url:            http://xdvi.sourceforge.net/
 # encodings.c is GPLv2+ and LGPL and MIT
 # read-mapfile.c tfmload.c are from dvips
@@ -52,9 +52,8 @@
 Patch8:		xdvik-22.84.13-bad_bar.patch
 
 %if %{with japanese}
-# Japanese patch for xdvi dervied from http://sourceforge.jp/projects/xdvi/
-# The only change is we have moved the first hunk to patch2001
-Patch1000:      xdvik-22.84.13-j1.36.1.patch.gz
+# Japanese patch for xdvi from http://sourceforge.jp/projects/xdvi/
+Patch1000:      xdvik-22.84.13-j1.36.patch.gz
 Patch1001:      pxdvik-22.84.13.patch
 Patch1002:      pxdvik-22.84.13-use-system-libs.patch
 %endif
@@ -97,12 +96,12 @@
 
 %if %{with japanese}
 # set up Japanese xdvi in its own directory
-cp -a texk/xdvik texk/pxdvik
+cp -ar texk/xdvik texk/xdvik-orig
 
-pushd texk/pxdvik
 # This is the Japanese xdvi patch
-%patch1000 -p3
-popd
+%patch1000 -p1
+mv texk/xdvik texk/pxdvik
+mv texk/xdvik-orig texk/xdvik
 
 # Build both the normal and the Japanese xdvi at the same time
 %patch1001 -p0
@@ -119,8 +118,10 @@
 # Build xdvik against system libs
 %patch2000 -p1 -b .use-system-libs
 
-# Fix unin32_t problem for xdvik (pxdvik is already fixed by Patch1000)
+%if %{without_japanese}
+# Fix unin32_t problem for xdvik (Patch1000 also contains this hunk)
 %patch2001 -p1
+%endif
 
 # Re-run autoconf against patched Makefile.ins
 ( cd texk/xdvik ; autoconf-2.13 -m $RPM_BUILD_DIR/%{name}-%{version}/texk/etc/autoconf )
@@ -268,6 +269,10 @@
 %endif
 
 %changelog
+* Sun Feb  3  2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-16
+- Change directory copying logic such that we can use the upstream Japanese
+  patch without modification
+
 * Sat Feb  2  2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-15
 - Fix definition of _texmf_main for now
 - Fix previous changelog entry version number