rpms/xdvik/devel xdvik.spec, 1.18, 1.19 texlive-xdvi-maxchar.patch, 1.1, NONE

[Jonathan G. Underwood (jgu)]

Author: jgu

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

Modified Files:
	xdvik.spec 
Removed Files:
	texlive-xdvi-maxchar.patch 
Log Message:
Remove texlive-xdvi-maxchar.patch. Renumber other patches.



Index: xdvik.spec
===================================================================
RCS file: /cvs/extras/rpms/xdvik/devel/xdvik.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xdvik.spec	29 Apr 2008 22:49:59 -0000	1.18
+++ xdvik.spec	29 Apr 2008 22:53:46 -0000	1.19
@@ -51,40 +51,36 @@
 # Fixed in upstream CVS post 22.84.13
 Patch2:         xdvik-22.84.13-keepflag-scrollfix.patch
 
-# This patch is in principle no longer needed
-# http://sourceforge.net/tracker/index.php?func=detail&aid=1875325&group_id=23164&atid=377580
-Patch3:         texlive-xdvi-maxchar.patch
-
 # Fix numlock key behaviour.
 # http://sourceforge.net/tracker/index.php?func=detail&aid=1875321&group_id=23164&atid=377580
 # Fixed in upstream CVS post 22.84.13
-Patch4:         texlive-source-xdvi-numlock.patch
+Patch3:         texlive-source-xdvi-numlock.patch
 
 # Fix browser open command to use xdg-open
 # http://sourceforge.net/tracker/index.php?func=detail&aid=1875309&group_id=23164&atid=377580
 # Fixed in upstream CVS post 22.84.13
-Patch5:         xdvik-22.84.13-xdgopen.patch
+Patch4:         xdvik-22.84.13-xdgopen.patch
 
 # Fix security issues with temp file creation
 # https://sourceforge.net/tracker/index.php?func=detail&aid=1953026&group_id=23164&atid=377580
 # Fixed in upstream CVS post 22.84.13
-Patch6:         xdvik-22.84.13-tempfix.patch
+Patch5:         xdvik-22.84.13-tempfix.patch
 
 # Fix typos in man pages.
 # http://sourceforge.net/tracker/index.php?func=detail&aid=1833567&group_id=23164&atid=377580
 # Fixed in upstream CVS post 22.84.13
-Patch7:		xdvik-22.84.13-manpage.patch
+Patch6:		xdvik-22.84.13-manpage.patch
 
 # Fix for a double Ctrl-L segfault (BZ #429429)
 # https://sourceforge.net/tracker/index.php?func=detail&aid=1953028&group_id=23164&atid=377580
 # Fixed in upstream CVS post 22.84.13
-Patch8:		xdvik-22.84.13-bad_bar.patch
+Patch7:		xdvik-22.84.13-bad_bar.patch
 
 # Fix bug with returning window ID.
 # https://bugzilla.redhat.com/show_bug.cgi?id=442445
 # https://sourceforge.net/tracker/index.php?func=detail&aid=1953023&group_id=23164&atid=377580
 # Fixed in upstream CVS post 22.84.13
-Patch9:		xdvik-22.84.13-windowid.patch
+Patch8:		xdvik-22.84.13-windowid.patch
 
 %if %{with japanese}
 # Japanese patch for xdvi from http://sourceforge.jp/projects/xdvi/
@@ -129,13 +125,12 @@
 
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
-%patch4 -p0
-%patch5 -p1 -b .xdgopen
-%patch6 -p1 -b .tempfix
-%patch7 -p0
-%patch8 -p1
-%patch9 -p1 -b .windowid
+%patch3 -p0
+%patch4 -p1 -b .xdgopen
+%patch5 -p1 -b .tempfix
+%patch6 -p0
+%patch7 -p1
+%patch8 -p1 -b .windowid
 
 # Allow Xaw3d enabled build of xdvi
 sed -i 's|/Xaw/|/Xaw3d/|' texk/xdvik/gui/*.[ch] texk/xdvik/*.[ch]
@@ -317,7 +312,7 @@
 %changelog
 * 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 maxchar patch
+- No longer apply the texlive-xdvi-maxchar.patch patch
 
 * Sun Apr 28  2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-18
 - Remove extraneous -r from cp command


--- texlive-xdvi-maxchar.patch DELETED ---