rpms/xdvik/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xdvik.spec, 1.20, 1.21

[Jonathan G. Underwood (jgu)]

Author: jgu

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

Modified Files:
	.cvsignore sources xdvik.spec 
Log Message:
Revert to version 22.84.13-j1.36 of the Japanese patch for now until we fix the
conflicts that arise with 22.84.13-j1.40.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xdvik/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Apr 2008 22:59:39 -0000	1.6
+++ .cvsignore	30 Apr 2008 09:08:52 -0000	1.7
@@ -1,2 +1,2 @@
 xdvik-22.84.13.tar.gz
-xdvik-22.84.13-j1.40.patch.gz
+xdvik-22.84.13-j1.36.patch.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xdvik/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Apr 2008 22:59:39 -0000	1.6
+++ sources	30 Apr 2008 09:08:52 -0000	1.7
@@ -1,2 +1,2 @@
 4d3d92381be42d7163e0f815f9cfb346  xdvik-22.84.13.tar.gz
-e67e814b92e7b07764efd4b9fde8e72c  xdvik-22.84.13-j1.40.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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xdvik.spec	29 Apr 2008 22:59:39 -0000	1.20
+++ xdvik.spec	30 Apr 2008 09:08:52 -0000	1.21
@@ -84,7 +84,7 @@
 
 %if %{with japanese}
 # Japanese patch for xdvi from http://sourceforge.jp/projects/xdvi/
-Patch1000:      xdvik-22.84.13-j1.40.patch.gz
+Patch1000:      xdvik-22.84.13-j1.36.patch.gz
 
 # Patch to allow building of both xdvik and pxdvik.
 # Local to Fedora, not appropriate to push upstream.
@@ -145,6 +145,7 @@
 mv texk/xdvik-orig texk/xdvik
 
 # Build both the normal and the Japanese xdvi at the same time
+kkkkkkkkk
 %patch1001 -p0
 
 # Build pxdvik against system libs
@@ -313,7 +314,6 @@
 * Sun Apr 28  2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-19
 - Add more commentary about upstream status of patches
 - No longer apply the texlive-xdvi-maxchar.patch patch
-- Update japanese patch to version 22.84.13-j1.40
 
 * Sun Apr 28  2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-18
 - Remove extraneous -r from cp command