rpms/tetex/F-8 tetex-3.0-xdvi-keepflag.patch, 1.2, 1.3 tetex.spec, 1.121, 1.122

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/tetex/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4660

Modified Files:
	tetex-3.0-xdvi-keepflag.patch tetex.spec 
Log Message:
fix navigation with a spacebar in xdvi (#417461)


tetex-3.0-xdvi-keepflag.patch:

Index: tetex-3.0-xdvi-keepflag.patch
===================================================================
RCS file: /cvs/extras/rpms/tetex/F-8/tetex-3.0-xdvi-keepflag.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tetex-3.0-xdvi-keepflag.patch	4 Nov 2005 14:52:58 -0000	1.2
+++ tetex-3.0-xdvi-keepflag.patch	20 Jan 2008 09:58:13 -0000	1.3
@@ -1,5 +1,24 @@
---- tetex-src-3.0/texk/xdvik/events.c.xdvi-keepflag	2004-11-29 17:45:11.000000000 -0700
-+++ tetex-src-3.0/texk/xdvik/events.c	2005-11-02 17:02:19.000000000 -0700
+diff -up tetex-src-3.0/texk/xdvik/xdvi.1.in.keepflag tetex-src-3.0/texk/xdvik/xdvi.1.in
+--- tetex-src-3.0/texk/xdvik/xdvi.1.in.keepflag	2008-01-20 10:42:20.000000000 +0100
++++ tetex-src-3.0/texk/xdvik/xdvi.1.in	2008-01-20 10:45:13.000000000 +0100
+@@ -867,6 +867,14 @@
+ .B up-or-previous()
+ and
+ .BR down-or-next() .
++(Note: this version of the program is modified to honour this
++flag for
++.B up-or-previous()
++and
++.BR down-or-next()
++although only for a horizontal position and not vertical. That allows
++for a "continuous" scrolling back an forth through a document with
++a display window narrower than a page width.)
+ .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+ .TP
+ .B \-l
+diff -up tetex-src-3.0/texk/xdvik/events.c.keepflag tetex-src-3.0/texk/xdvik/events.c
+--- tetex-src-3.0/texk/xdvik/events.c.keepflag	2004-11-30 01:45:11.000000000 +0100
++++ tetex-src-3.0/texk/xdvik/events.c	2008-01-20 10:45:13.000000000 +0100
 @@ -696,10 +696,12 @@ home(wide_bool scrl)
      {
  	int value;
@@ -17,7 +36,16 @@
  
  	value = (globals.page.h - mane.height) / 2;
  	if (value > resource.topmargin_int / mane.shrinkfactor)
-@@ -745,10 +747,12 @@ home_bottom(wide_bool scrl)
+@@ -708,7 +710,7 @@ home(wide_bool scrl)
+     }
+ # else
+     get_xy();
+-    if (globals.widgets.x_bar != NULL) {
++    if (!resource.keep_flag && globals.widgets.x_bar != NULL) {
+ 	int coord = (globals.page.w - mane.width) / 2;
+ 
+ 	if (coord > resource.sidemargin_int / mane.shrinkfactor)
+@@ -745,16 +747,18 @@ home_bottom(wide_bool scrl)
      {
  	int value;
  
@@ -34,3 +62,10 @@
  
  	(void)set_bar_value(globals.widgets.y_bar, (int)(globals.page.h - mane.height), (int)(globals.page.h - mane.height));
      }
+ #else /* MOTIF */
+     get_xy();
+-    if (globals.widgets.x_bar != NULL) {
++    if (!resource.keep_flag && globals.widgets.x_bar != NULL) {
+ 	int coord = (globals.page.w - mane.width) / 2;
+ 
+ 	if (coord > resource.sidemargin_int / mane.shrinkfactor)


Index: tetex.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex/F-8/tetex.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- tetex.spec	18 Jan 2008 13:40:17 -0000	1.121
+++ tetex.spec	20 Jan 2008 09:58:13 -0000	1.122
@@ -11,7 +11,7 @@
 Summary: The TeX text formatting system.
 Name: tetex
 Version: 3.0
-Release: 44.6%{?dist}
+Release: 44.7{?dist}
 License: Public Domain and GPLv2 and MIT and LPPL and Utopia and Artistic 2.0
 Group: Applications/Publishing
 Requires: tmpwatch, dialog, ed
@@ -299,7 +299,7 @@
 %patch13 -p1 -b .rightarrow
 # Fix usage of uninitialized variable (bug #149212)
 %patch14 -p1 -b .dcb314
-# Fix xdvi - navigation with a spacebar does not keep position (bug #168124)
+# Fix xdvi - navigation with a spacebar does not keep position (bug #168124, #417461)
 %patch15 -p1 -b .xdvi-keepflag
 # Fix obsolete option passed to sort in texconfig (#172337)
 %patch16 -p1 -b .texconfig-sortfix
@@ -894,6 +894,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Sun Jan 20 2008 Jindrich Novy <jnovy at redhat.com> 3.0-44.7
+- fix navigation with a spacebar in xdvi (#417461)
+
 * Fri Jan 18 2008 Jindrich Novy <jnovy at redhat.com> 3.0-44.6
 - obsolete only old xdvik version in order to not to clash wih
   newer xdvik, which is packaged separately