[gallery2] jpegtan patch.

[Jon Ciesla]

commit ae85a13a859d797e58ff072230b0dffa42a85c3f
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Dec 7 11:08:06 2011 -0600

    jpegtan patch.

 gallery2-2.3.1-jpegtran.patch |   11 +++++++++++
 gallery2.spec                 |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/gallery2-2.3.1-jpegtran.patch b/gallery2-2.3.1-jpegtran.patch
new file mode 100644
index 0000000..0511bfb
--- /dev/null
+++ b/gallery2-2.3.1-jpegtran.patch
@@ -0,0 +1,11 @@
+--- modules/jpegtran/classes/JpegtranToolkitHelper.class	2008-07-29 19:02:08.000000000 +0900
++++ modules/jpegtran/classes/JpegtranToolkitHelper.class	2011-12-07 04:52:37.258771390 +0900
+@@ -141,7 +141,7 @@ 
+ 	    $detectsDimensions = false;
+ 	    $isFinished = false;
+ 	    while (null !== ($line = array_shift($stderr))) {
+-		if (preg_match("/Independent JPEG Group's JPEGTRAN/", $line)) {
++		if (preg_match("/Independent JPEG Group's (JPEGTRAN|libjpeg)/", $line)) {
+ 		    $isJpegtran = true;
+ 		} else if (preg_match('/Start Of Frame 0xc0: width=50, height=50, components=3/',
+ 				      $line)) {
diff --git a/gallery2.spec b/gallery2.spec
index d18cd92..e2eb466 100644
--- a/gallery2.spec
+++ b/gallery2.spec
@@ -7,7 +7,7 @@ URL: http://gallery.menalto.com
 Name: gallery2
 Version: 2.3.1
 Group: Applications/Publishing
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 #Source0: http://dl.sf.net/gallery/gallery-%{version}-full.zip
 # Tarball from upstream contains prebuilt jars, some of which are not redistributable.
@@ -36,6 +36,7 @@ Obsoletes: gallery2-slideshowapplet <= 2.3-7
 Patch2: gallery2-2.3-captcha.patch
 Patch3: gallery2-2.3-installer.patch
 Patch4: gallery2-2.3-upgrade.patch
+Patch5: gallery2-2.3.1-jpegtran.patch
 
 %package albumselect
 Summary: Albumselect module for Gallery 2
@@ -691,6 +692,7 @@ subalbums/other items not shown
 %patch2 -p0
 %patch3 -p0
 %patch4 -p0
+%patch5 -p0
 
 %build
 #pushd lib/tools/bin
@@ -1114,6 +1116,9 @@ fi
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
+* Wed Dec 07 2011 Jon Ciesla <limburgher at gmail.com> - 2.3.1-4
+- Patch for jpegtran output, BZ 712558.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild