diff --git a/.gitignore b/.gitignore index e82db86..29bc813 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/latexmk-440.zip +/latexmk-440h.zip diff --git a/latexmk-conf.patch b/latexmk-conf.patch index 340368a..a774983 100644 --- a/latexmk-conf.patch +++ b/latexmk-conf.patch @@ -1,6 +1,6 @@ ---- ./latexmk.1.orig 2014-01-15 14:09:21.000000000 -0700 -+++ ./latexmk.1 2014-01-27 07:30:00.000000000 -0700 -@@ -962,6 +962,7 @@ system RC file, in the following order, +--- ./latexmk.1.orig 2014-12-05 14:33:36.000000000 -0700 ++++ ./latexmk.1 2014-12-09 16:28:40.671836372 -0700 +@@ -981,6 +981,7 @@ system RC file, in the following order, "/opt/local/share/latexmk/LatexMk", "/usr/local/share/latexmk/LatexMk", "/usr/local/lib/latexmk/LatexMk". @@ -8,18 +8,22 @@ On a MS-WINDOWS system it looks for "C:\\latexmk\\LatexMk". On a cygwin system (i.e., a MS-Windows system in which Perl is that of cygwin), \fIlatexmk\fR reads for the first it finds of ---- ./latexmk.pl.orig 2014-01-15 15:37:34.000000000 -0700 -+++ ./latexmk.pl 2014-01-27 07:30:00.000000000 -0700 -@@ -858,10 +858,8 @@ else { +--- ./latexmk.pl.orig 2014-12-09 16:28:40.679836368 -0700 ++++ ./latexmk.pl 2014-12-09 16:30:32.798767779 -0700 +@@ -928,13 +928,9 @@ else { ## /usr/local/share, depending on the local conventions. - ## /usr/local/lib/latexmk/LatexMk is put in the list for + ## But /usr/local/lib/latexmk is put in the list for ## compatibility with older versions of latexmk. -- @rc_system_files = -- ( '/opt/local/share/latexmk/LatexMk', -- '/usr/local/share/latexmk/LatexMk', -- '/usr/local/lib/latexmk/LatexMk' ); +- @rc_system_files = (); +- foreach ( 'LatexMk', 'latexmkrc' ) { +- push @rc_system_files, +- ( "/opt/local/share/latexmk/$_", +- "/usr/local/share/latexmk/$_", +- "/usr/local/lib/latexmk/$_" ); +- } + ## Fedora change: only look in /etc + @rc_system_files = ( '/etc/latexmk.conf' ); - ++ $search_path_separator = ':'; # Separator of elements in search_path + $dvi_update_signal = $signo{USR1} diff --git a/latexmk.conf b/latexmk.conf index e6b5880..aa3df2d 100644 --- a/latexmk.conf +++ b/latexmk.conf @@ -325,6 +325,9 @@ $ps_update_method = 1; # Whether to suppress latex messages # $silent = 0; +# Whether to suppress a summary of warnings in the log file +# $silence_logfile_warnings = 0; + # The time to sleep in seconds between checking for source file changes when # running in continuous update mode # $sleep_time = 2; diff --git a/latexmk.spec b/latexmk.spec index c6e0f5f..6761d7d 100644 --- a/latexmk.spec +++ b/latexmk.spec @@ -1,9 +1,9 @@ Name: latexmk -Version: 4.40 -Release: 2%{?dist} +Version: 4.40h +Release: 1%{?dist} Summary: A make-like utility for LaTeX files -%global upstreamver %(sed 's/\\.//' <<<%{version}) +%global upstreamver %(sed 's/\\.//' <<< %{version}) Group: Applications/Publishing License: GPLv2+ @@ -18,7 +18,7 @@ Source2: latexmk-README.fedora Patch0: latexmk-conf.patch BuildArch: noarch -Requires: tex(latex), ghostscript, xdg-utils +Requires: tex-latex-bin, ghostscript, xdg-utils %description Latexmk is a perl script for running LaTeX the correct number of times to @@ -37,14 +37,8 @@ Before using a previewer, read the file README.fedora. %patch0 # Invoke perl directly -sed "s|^#\!/usr/bin/env perl|#\!/usr/bin/perl -w|" latexmk.pl > latexmk.pl.new -touch -r latexmk.pl latexmk.pl.new -mv -f latexmk.pl.new latexmk.pl - -# Fix a minor man page bug -sed -i.orig "s/^'/\\\\'/" latexmk.1 -touch -r latexmk.1.orig latexmk.1 -rm -f latexmk.1.orig +sed -i.orig "s|^#\!/usr/bin/env perl|#\!/usr/bin/perl -w|" latexmk.pl +touch -r latexmk.pl.orig latexmk.pl %build cp -p %{SOURCE2} README.fedora @@ -61,10 +55,26 @@ install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir} %{_bindir}/* %{_mandir}/man1/* %config(noreplace) %{_sysconfdir}/latexmk.conf -%doc CHANGES COPYING INSTALL README README.fedora extra-scripts example_rcfiles +%doc CHANGES INSTALL README README.fedora extra-scripts example_rcfiles %doc latexmk.pdf +%license COPYING %changelog +* Tue Dec 9 2014 Jerry James - 4.40h-1 +- Fix license handling +- Relax LaTeX Requires slightly +- Update to 4.40h: +- When -jobname option is used, quote it on command line. +- Change maintainer's preferred e-mail. +- Attempt to improve handling of errors from (pdf)latex. +- Fix up for the making of -eps-converted-to.pdf +- Improve listing of warning lines from log file. +- Fix failure when using both -cd and -output-directory +- If user's home directory can't be determined, then don't read ~/.latexmkrc +- Introduce configuration variable $silence_logfile_warnings +- In setting $pscmd, allow for non-existent environment variable USER +- Miscellaneous corrections. + * Sat Jun 07 2014 Fedora Release Engineering - 4.40-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index aa3ceae..995769a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -45a25471f54c40466662c292af371962 latexmk-440.zip +811cf4bd8019b78981f4b49631dc66a8 latexmk-440h.zip