From 74d0b40a6e8d1f5e0bd15448a0557984d7ced55b Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Apr 19 2011 16:55:53 +0000
Subject: Merge branch 'master' into f14


---

diff --git a/.gitignore b/.gitignore
index 8b5ee77..63487b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-latexmk-423.zip
+latexmk-423a.zip
diff --git a/latexmk-conf.patch b/latexmk-conf.patch
index 57b564f..42cf9c5 100644
--- a/latexmk-conf.patch
+++ b/latexmk-conf.patch
@@ -1,16 +1,6 @@
---- latexmk.1.orig	2011-03-22 07:32:52.000000000 -0600
-+++ latexmk.1	2011-03-28 10:00:36.478299325 -0600
-@@ -645,6 +645,7 @@
-    "/opt/local/share/latexmk/LatexMk",
-    "/usr/local/share/latexmk/LatexMk",
-    "/usr/local/lib/latexmk/LatexMk".
-+   On a Fedora system, it only looks for "/etc/latexmk.conf".
-    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	2011-03-21 19:05:02.000000000 -0600
-+++ latexmk.pl	2011-03-28 10:00:36.481299174 -0600
-@@ -673,10 +673,8 @@
+--- ./latexmk.pl.orig	2011-03-24 12:35:38.000000000 -0600
++++ ./latexmk.pl	2011-04-19 10:35:48.179112906 -0600
+@@ -675,10 +675,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.
@@ -23,3 +13,13 @@
  
      $search_path_separator = ':';  # Separator of elements in search_path
  
+--- ./latexmk.1.orig	2011-04-18 09:47:26.000000000 -0600
++++ ./latexmk.1	2011-04-19 10:35:48.177113158 -0600
+@@ -645,6 +645,7 @@
+    "/opt/local/share/latexmk/LatexMk",
+    "/usr/local/share/latexmk/LatexMk",
+    "/usr/local/lib/latexmk/LatexMk".
++   On a Fedora system, it only looks for "/etc/latexmk.conf".
+    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
diff --git a/latexmk.spec b/latexmk.spec
index 205fe53..02ecd48 100644
--- a/latexmk.spec
+++ b/latexmk.spec
@@ -1,12 +1,12 @@
 Name:           latexmk
-Version:        4.23
+Version:        4.23a
 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-423.zip
+Source0:        http://www.phys.psu.edu/~collins/software/latexmk-jcc/latexmk-423a.zip
 Source1:        latexmk.conf
 Source2:        latexmk-README.fedora
 # Change the system-wide configuration file to /etc/latexmk.conf and fix the
@@ -33,12 +33,11 @@ Before using a previewer, read the file README.fedora.
 %prep
 %setup -q -c
 %patch0
-cp %{SOURCE2} README.fedora
 
 %build
+cp -p %{SOURCE2} README.fedora
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
@@ -54,6 +53,9 @@ install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 %doc CHANGES COPYING INSTALL README README.fedora extra-scripts example_rcfiles
 
 %changelog
+* Tue Apr 19 2011 Jerry Jamse <loganjerry@gmail.com> - 4.23a-1
+- Update to 4.23a (fix detection of source files listed in .fls file)
+
 * Mon Mar 28 2011 Jerry James <loganjerry@gmail.com> - 4.23-1
 - Update to 4.23 (several bug fixes, new dependency-tracking functionality)
 - Drop BuildRoot and %%clean
diff --git a/sources b/sources
index 420d73e..89ac851 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78b3fb3d2b1e963db17fa9d10b37a9cc  latexmk-423.zip
+a527238158c84c5d3805db27791ccc48  latexmk-423a.zip