rpms/tetex/devel tetex-3.0-tkdefaults.patch, NONE, 1.1 tetex-3.0-tkdep.patch, NONE, 1.1 tetex.spec, 1.65, 1.66

[fedora-cvs-commits redhat com]

Author: jnovy

Update of /cvs/dist/rpms/tetex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4695

Modified Files:
	tetex.spec 
Added Files:
	tetex-3.0-tkdefaults.patch tetex-3.0-tkdep.patch 
Log Message:

- fix behaviour of texdoctk



tetex-3.0-tkdefaults.patch:
 texdocrc.defaults |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE tetex-3.0-tkdefaults.patch ---
--- tetex-src-3.0/texmf/texdoctk/texdocrc.defaults.tkdefaults	2004-05-22 15:58:35.000000000 +0200
+++ tetex-src-3.0/texmf/texdoctk/texdocrc.defaults	2005-07-21 10:57:37.522433208 +0200
@@ -26,14 +26,14 @@
 DVIPS_CONV=dvips -q
 
 # PostScript handling
-PS_VIEWER=ghostview
+PS_VIEWER=evince
 
 # PDF handling
-PDF_VIEWER=acroread
-PDFPS_CONV=acroread -toPostScript -pairs
+PDF_VIEWER=evince
+PDFPS_CONV=pdftops -q
 
 # HTML handling
-HTML_VIEWER=netscape
+HTML_VIEWER=firefox
 HTMLPS_CONV=
 # HTMLPS_REDIR must be on, if the html->ps converter normally writes its output
 # to stdout instead of a file (e.g. as html2ps) (y or yes to make active)
@@ -48,6 +48,6 @@
 TXTPS_REDIR=yes
 
 # printer
-PRINT_CMD=lpr -Plp
+PRINT_CMD=lpr
 
 # end of config

tetex-3.0-tkdep.patch:
 texdoctk |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE tetex-3.0-tkdep.patch ---
--- tetex-src-3.0/texk/tetex/texdoctk.tkdep	2004-11-06 00:12:14.000000000 +0100
+++ tetex-src-3.0/texk/tetex/texdoctk	2005-07-18 14:57:54.132164864 +0200
@@ -9,7 +9,11 @@
 # and the full disclaimer.
 ###############################################################################
 use strict;
-use Tk;
+BEGIN {
+  eval {require Tk;};
+  die "This program requires perl-Tk. Try to look in fedora-extras.\n" if $@;
+  import Tk;
+}
 use Getopt::Long;
 Getopt::Long::config('bundling');
 use File::Basename;


Index: tetex.spec
===================================================================
RCS file: /cvs/dist/rpms/tetex/devel/tetex.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- tetex.spec	20 Jun 2005 14:00:03 -0000	1.65
+++ tetex.spec	22 Jul 2005 08:24:32 -0000	1.66
@@ -60,6 +60,8 @@
 Patch3: tetex-texmf-dvipsgeneric.patch
 Patch4: tetex-3.0-texdoc-defaults.patch
 Patch5: tetex-3.0-browser.patch
+Patch6: tetex-3.0-tkdep.patch
+Patch7: tetex-3.0-tkdefaults.patch
 
 ######
 # teTeX patches
@@ -260,6 +262,8 @@
 %patch4 -p1 -b .texdoc-defaults
 # Use htmlview first
 %patch5 -p1 -b .browser
+%patch6 -p1 -b .tkdep
+%patch7 -p1 -b .tkdefaults
 
 ######
 # teTeX patches
@@ -769,6 +773,14 @@
 %defattr(-,root,root)
 
 %changelog
+* Thu Jul 21 2005 Jindrich Novy <jnovy redhat com> 3.0-5
+- fix texdoctk bindings to fit FC (#162442)
+- fix some usages of uninitialized variables (#162413)
+
+* Mon Jul 18 2005 Jindrich Novy <jnovy redhat com>
+- inform user about perl-Tk dependency when using
+  texdoctk (#162441)
+
 * Mon Jun 20 2005 Jindrich Novy <jnovy redhat com>
 - add obsoletes for tetex-beamer, tetex-pgf, tetex-xcolor
   to avoid conflicts with Extras (#160754)
@@ -776,7 +788,7 @@
 * Mon Jun  6 2005 Jindrich Novy <jnovy redhat com>
 - convert spec to UTF-8 (#159583)
 
-* Wed Jun  1 2005 Jindrich Novy <jnovy redhat com> 3.0-5
+* Wed Jun  1 2005 Jindrich Novy <jnovy redhat com>
 - remove dependency on w3c-libwww
 - don't use uninitialized tmp_size (#157178)
 - add a possibility to define default paper in spec