From d43903f56f90c84c2015adb3ce4e83268186a12c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 1 Dec 2008 20:40:54 +0000 Subject: [PATCH] - Update to 4.02b to fix bz 473430 --- .cvsignore | 2 +- latexmk-conf.patch | 103 ++++++++++++++++++++++++--------------------- latexmk.spec | 7 ++- sources | 2 +- 4 files changed, 61 insertions(+), 53 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8b4d759..58e55c2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -latexmk-401.zip +latexmk-402b.zip diff --git a/latexmk-conf.patch b/latexmk-conf.patch index cdaf1e5..7ec3afc 100644 --- a/latexmk-conf.patch +++ b/latexmk-conf.patch @@ -1,10 +1,10 @@ -diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 ---- latexmk-4.01.ORIG/latexmk.1 2008-09-28 14:14:18.000000000 -0600 -+++ latexmk-4.01/latexmk.1 2008-10-13 12:17:22.000000000 -0600 +diff -dur latexmk-4.02b.ORIG/latexmk.1 latexmk-4.02b/latexmk.1 +--- latexmk-4.02b.ORIG/latexmk.1 2008-12-01 11:56:01.000000000 -0700 ++++ latexmk-4.02b/latexmk.1 2008-12-01 13:08:00.000000000 -0700 @@ -1,9 +1,9 @@ --.TH LATEXMK 1L "28 September 2008" "" +-.TH LATEXMK 1L "1 December 2008" "" -.SH NAME -+.TH "LATEXMK" "1L" "28 September 2008" "" "" ++.TH "LATEXMK" "1L" "1 December 2008" "" "" +.SH "NAME" latexmk \- generate LaTeX document -.SH SYNOPSIS @@ -153,10 +153,10 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 +.B \-c Clean up (remove) all regeneratable files generated by \fIlatex\fR and \fIbibtex\fR except dvi, postscript and pdf. These files are a - combination of log files, aux files, and those with extensions -@@ -133,44 +133,44 @@ - removed. But the file containing a database of source file - information is not removed. + combination of log files, aux files, latexmk's database file of source +@@ -134,43 +134,43 @@ + files with extensions by the \fI$clean_ext\fR configuration variable are + removed. -This cleanup is instead of a regular make. See the \fB-gg\fR option +This cleanup is instead of a regular make. See the \fB\-gg\fR option @@ -176,15 +176,13 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 .TP -.B -CA +.B \-CA - Clean up (remove) absolutely all regeneratable files. This is the --action specified by \fB-C\fR with the addition of deleting the file -+action specified by \fB\-C\fR with the addition of deleting the file - containing the database of source file information. + Clean up (remove) absolutely all regeneratable files. It is now +-equivalent to the \fB-C\fR option ++equivalent to the \fB\-C\fR option --This cleanup is instead of a regular make. It is the same as \fB-C ---CF\fR. See the \fB-gg\fR option if you want to do a cleanup then a -+This cleanup is instead of a regular make. It is the same as \fB\-C -+\-CF\fR. See the \fB\-gg\fR option if you want to do a cleanup then a + This cleanup is instead of a regular make. +-See the \fB-gg\fR option if you want to do a cleanup then a ++See the \fB\-gg\fR option if you want to do a cleanup then a make. .TP -.B -CF @@ -916,7 +914,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 .B @BIBINPUTS This is an array variable, now mostly obsolete, that specifies directories where -@@ -733,44 +733,44 @@ +@@ -733,50 +733,50 @@ two and the second two examples are equivalent. Each backward slash should be doubled to avoid running afoul of \fIPerl\fR's rules for writing strings. @@ -937,6 +935,13 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 +.B $bibtex_silent_switch ["\-terse"] \fBSwitch(es)\fR for the BibTeX processing program when silent mode is on. -.TP ++.TP + .B $cleanup_includes_generated [0] + If nonzero, specifies that cleanup also deletes files that are + detected in log file as being generated (see the \\openout lines in + the log file). It will also include files made from these first + generation generated files. +-.TP +.TP .B $cleanup_mode [0] If nonzero, specifies cleanup mode: 1 for full cleanup, 2 for cleanup @@ -976,7 +981,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 .B @default_files [("*.tex")] Default list of files to be processed. -@@ -797,63 +797,63 @@ +@@ -803,63 +803,63 @@ is ".tex". Wild cards are allowed. The parentheses are because \fI@default_files\fR is an array variable, i.e., a sequence of filename specifications is possible. @@ -1065,7 +1070,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 How the dvi viewer updates its display when the dvi file has changed. The values here apply equally to the \fI$pdf_update_method\fR and to the \fI$ps_update_method\fR variables. -@@ -864,37 +864,37 @@ +@@ -870,37 +870,37 @@ \fI$dvi_update_signal\fR. The default value under UNIX is suitable for xdvi. 3 => Viewer cannot do an update, because it locks the file. (As with @@ -1113,7 +1118,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 rerun of (pdf)LaTeX is needed after a run that gives an error. (Normally, a change of a source file during a run should provoke a -@@ -903,7 +903,7 @@ +@@ -909,7 +909,7 @@ an error, a new run should occur until the user has made a change in the files. But the user may have corrected an error in a source .tex file during the run. So \fIlatexmk\fR needs to distinguish @@ -1122,7 +1127,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 automatically generated files as those with extensions in the list in @generated_exts.) -@@ -916,11 +916,11 @@ +@@ -922,11 +922,11 @@ adds the extension "end" to the list of predefined generated extensions. (This extension is used by the RevTeX package, for example.) @@ -1137,7 +1142,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 .B %hash_calc_ignore_pattern \fB!!!This variable is for experts only!!!\fR -@@ -940,15 +940,15 @@ +@@ -946,15 +946,15 @@ $hash_calc_ignore_pattern{'eps'} = '^%%CreationDate: '; This creates a rule for files with extension \fI.eps\fR about lines to @@ -1156,7 +1161,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 .B $kpsewhich ["kpsewhich %S"] The program called to locate a source file when the name alone is not sufficient. Most filenames used by \fIlatexmk\fR have sufficient path -@@ -960,28 +960,28 @@ +@@ -966,28 +966,28 @@ See also the \fI@BIBINPUTS\fR variable for another way that \fIlatexmk\fR also uses to try to locate files; it applies only in the case of .bib files. @@ -1196,7 +1201,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 printing files. But there are ways you can do it. For example, if you have gsview installed, you could use it with the option "/p": -@@ -995,14 +995,14 @@ +@@ -1001,14 +1001,14 @@ the command obeyed; this is necessary because one part of the command name ("Program Files") contains a space which would otherwise be misinterpreted. @@ -1214,7 +1219,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 e.g., $lpr = '"c:/Program Files/Ghostgum/gsview/gsview32.exe" /p'; -@@ -1012,27 +1012,27 @@ +@@ -1018,27 +1018,27 @@ is necessary because one part of the command name ("Program Files") contains a space which would otherwise be misinterpreted. @@ -1250,7 +1255,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 .B $pdf_mode [0] If zero, do NOT generate a pdf version of the document. If equal to 1, generate a pdf version of the document using pdflatex. -@@ -1041,39 +1041,39 @@ +@@ -1047,39 +1047,39 @@ If equal to 3, generate a pdf version of the document from the dvi file, by using the command specified by the \fI$dvipdf\fR variable. @@ -1305,7 +1310,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 How the pdf viewer updates its display when the pdf file has changed. See the information on the variable \fI$dvi_update_method\fR for the codes. (Note that information needs be changed slightly so -@@ -1082,64 +1082,64 @@ +@@ -1088,64 +1088,64 @@ value 2, to specify update by signal, the signal is specified by \fI$pdf_update_signal\fR.) @@ -1393,7 +1398,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 determine if there is an already running previewer, and to find the process ID (needed if \fIlatexmk\fR needs to signal the previewer about file changes). -@@ -1148,27 +1148,27 @@ +@@ -1154,27 +1154,27 @@ one process. See the \fI$pid_position\fR variable for how the process number is determined. @@ -1432,7 +1437,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 whenever the postscript file changes, whereas ghostview does not. However, different versions of gv have slightly different ways of writing this option. You can configure this variable apppropriately. -@@ -1176,16 +1176,16 @@ +@@ -1182,16 +1182,16 @@ \fBWARNING\fR: Linux systems may have installed one (or more) versions of gv under different names, e.g., ggv, kghostview, etc, but perhaps not one called gv. @@ -1455,7 +1460,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 How the postscript viewer updates its display when the ps file has changed. See the information on the variable \fI$dvi_update_method\fR for the codes. (Note that information needs be changed slightly so -@@ -1194,25 +1194,25 @@ +@@ -1200,25 +1200,25 @@ value 2, to specify update by signal, the signal is specified by \fI$ps_update_signal\fR.) @@ -1489,7 +1494,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 .B $tmpdir [See below for default] Directory to store temporary files that \fIlatexmk\fR may generate while running. -@@ -1221,20 +1221,20 @@ +@@ -1227,20 +1227,20 @@ \fI$tmpdir\fR to the value of the first of whichever of the system environment variables TMPDIR or TEMP exists, otherwise to the current directory. Under other operating systems (expected to be UNIX/Linux, @@ -1515,7 +1520,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 \fI.eps\fR to be included in the \fI.tex\fR file. The old method of configuring \fIlatexmk\fR was to directly manipulate -@@ -1249,35 +1249,35 @@ +@@ -1255,35 +1255,35 @@ The custom dependency is a list of rules, each of which is specified as follow: @@ -1562,7 +1567,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 the corresponding source file. To make the new destination file, the \fIPerl\fR subroutine specified in the -@@ -1287,7 +1287,7 @@ +@@ -1293,7 +1293,7 @@ even by those without knowledge of the \fIPerl\fR programming language. Of course, experts could do something much more elaborate. @@ -1571,7 +1576,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 specifies how the rule should be applied when the source file fails to exist. -@@ -1295,19 +1295,19 @@ +@@ -1301,19 +1301,19 @@ add_cus_dep( 'fig', 'eps', 0, 'fig2eps' ); sub fig2eps { @@ -1594,7 +1599,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 subroutine defined in the above code with a single argument "figure", which is the basename of each of the files (possibly with a path component). This argument is referred to by \fIPerl\fR as $_[0]. In -@@ -1316,7 +1316,7 @@ +@@ -1322,7 +1322,7 @@ are a \fIPerl\fR idiom that signify that each string of the form of a variable name, $_[0] in this case, is to be substituted by its value. @@ -1603,7 +1608,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 will assume an error occurred during the execution of the subroutine. In the above example, no explicit return value is given, and instead the return value is the value returned by the last (and only) -@@ -1330,7 +1330,7 @@ +@@ -1336,7 +1336,7 @@ add_cus_dep( 'fig', 'eps', 0, 'fig2eps' ); sub fig2eps { @@ -1612,7 +1617,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 } This causes the invocation of the \fIfig2dev\fR program to have quoted -@@ -1346,7 +1346,7 @@ +@@ -1352,7 +1352,7 @@ add_cus_dep( 'fig', 'pdf, 0, 'fig2pdf' ); sub fig2pdf { @@ -1621,7 +1626,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 } If you have some general custom dependencies defined in the system or -@@ -1365,8 +1365,8 @@ +@@ -1371,8 +1371,8 @@ in an initialization file. Another example of a custom dependency overcomes a limitation of @@ -1632,7 +1637,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 latex/pdflatex to an ".ind" file to be read in on a subsequent run. But with the index.sty package you can create extra indexes with extensions that you configure. \fILatexmk\fR does not know how to -@@ -1379,7 +1379,7 @@ +@@ -1385,7 +1385,7 @@ add_cus_dep('ndx', 'nnd', 0, 'makendx2nnd'); sub makendx2nnd { @@ -1641,7 +1646,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 } (You will need to modify this code if you use filenames -@@ -1388,7 +1388,7 @@ +@@ -1394,7 +1394,7 @@ Those of you with experience with Makefiles, will undoubtedly be concerned that the \fI.ndx\fR file is written during a run of latex/pdflatex and is always later than the \fI.nnd\fR last read in. @@ -1650,7 +1655,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 situation, of circular dependencies, is endemic to latex, and \fIlatexmk\fR in its current version works correctly with circular dependencies. It examines the contents of the files (by use of an md5 -@@ -1402,32 +1402,32 @@ +@@ -1408,32 +1408,32 @@ Glossaries can be dealt with similarly. @@ -1691,7 +1696,7 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 Sometimes a viewer (gv) tries to read an updated .ps or .pdf file after its creation is started but before the file is complete. Work around: manually refresh (or reopen) display. Or use one of the other -@@ -1439,31 +1439,31 @@ +@@ -1445,31 +1445,31 @@ Gv on UNIX/LINUX works for both postscript and pdf. Ghostview on UNIX/LINUX needs a manual update (reopen); it views postscript and pdf. @@ -1717,9 +1722,9 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 -.SH AUTHOR +.SH "AUTHOR" Current version, by John Collins (username collins at node phys.psu.edu). - (Version 4.01). + (Version 4.01a). - It can be obtained from CTAN: + Released version (last was 4.01) can be obtained from CTAN: -, and from the +, and from the author's website . @@ -1731,10 +1736,10 @@ diff -dur latexmk-4.01.ORIG/latexmk.1 latexmk-4.01/latexmk.1 Original script called "go" by David J. Musliner (RCS Version 3.2) \" LocalWords: fR fIlatexmk dvi ps fILatexmk pdflatex bibtex makeindex fB pv -diff -dur latexmk-4.01.ORIG/latexmk.pl latexmk-4.01/latexmk.pl ---- latexmk-4.01.ORIG/latexmk.pl 2008-09-24 16:30:39.000000000 -0600 -+++ latexmk-4.01/latexmk.pl 2008-10-13 12:15:17.000000000 -0600 -@@ -643,10 +643,8 @@ +diff -dur latexmk-4.02b.ORIG/latexmk.pl latexmk-4.02b/latexmk.pl +--- latexmk-4.02b.ORIG/latexmk.pl 2008-12-01 11:54:20.000000000 -0700 ++++ latexmk-4.02b/latexmk.pl 2008-12-01 13:04:12.000000000 -0700 +@@ -680,10 +680,8 @@ ## /usr/local/share, depending on the local conventions. ## /usr/local/lib/latexmk/LatexMk is put in the list for ## compatibility with older versions of latexmk. diff --git a/latexmk.spec b/latexmk.spec index 02b0eb9..3c61235 100644 --- a/latexmk.spec +++ b/latexmk.spec @@ -1,12 +1,12 @@ Name: latexmk -Version: 4.01 +Version: 4.02b Release: 1%{?dist} Summary: A make-like utility for LaTeX files Group: Applications/Publishing License: GPLv2+ URL: http://www.phys.psu.edu/~collins/software/latexmk-jcc/ -Source0: http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-401.zip +Source0: http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-402b.zip Source1: latexmk.conf Source2: latexmk-README.fedora # Change the system-wide configuration file to /etc/latexmk.conf and fix the @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %doc CHANGES COPYING INSTALL README README.fedora extra-scripts %changelog +* Mon Dec 1 2008 Jerry James - 4.02b-1 +- Update to 4.02b to fix bz 473430 + * Mon Oct 13 2008 Jerry James - 4.01-1 - New version 4.01. diff --git a/sources b/sources index 54b6ab1..da8d5b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7bdcf4c77db981c0c29b38ae657625f4 latexmk-401.zip +8ec3792d8e557eaf6949522ab5e2deae latexmk-402b.zip