From 684f20f69af9bb4441f2d031d9591e8a14d682ed Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Feb 04 2011 18:34:48 +0000
Subject: A smaller/minimalistic patch, less code = win


---

diff --git a/digikam-1.8.0-libjpeg_version-3.patch b/digikam-1.8.0-libjpeg_version-3.patch
new file mode 100644
index 0000000..1e2c590
--- /dev/null
+++ b/digikam-1.8.0-libjpeg_version-3.patch
@@ -0,0 +1,11 @@
+diff -up digikam-1.8.0/CMakeLists.txt.libjpeg_version digikam-1.8.0/CMakeLists.txt
+--- digikam-1.8.0/CMakeLists.txt.libjpeg_version	2011-01-23 13:33:57.000000000 -0600
++++ digikam-1.8.0/CMakeLists.txt	2011-02-04 12:17:54.102537201 -0600
+@@ -154,6 +154,7 @@ ENDIF(NOT APPLE)
+ # Extract version of libjpeg so that we can use the appropriate dir
+ # See bug #227313, #228483
+ FILE(READ "${JPEG_INCLUDE_DIR}/jpeglib.h" jpeglib_h_content)
++FILE(READ "${JPEG_INCLUDE_DIR}/jconfig.h" jpeglib_h_content)
+ STRING(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jpeglib_version "${jpeglib_h_content}")
+ MESSAGE(STATUS "Identified libjpeg version: ${jpeglib_version}")
+ 
diff --git a/digikam.spec b/digikam.spec
index 610c76d..6d13ab9 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -16,10 +16,10 @@ Source1: digikam-import.desktop
 
 ## upstreamable patches
 Patch50: digikam-1.4.0_marble_plugin_rpath.patch
-# fix for libjpeg-turbo, needs love
+# fix for libjpeg-turbo,  see https://bugs.kde.org/show_bug.cgi?id=265431 
 Patch51: digikam-1.8.0-libjpeg_version.patch
-# a more upstreamable version, see https://bugs.kde.org/show_bug.cgi?id=265431
-Patch52: digikam-1.8.0-libjpeg_version-2.patch
+# a more minimal, upstreamable version
+Patch52: digikam-1.8.0-libjpeg_version-3.patch
 # gcc-4.6-ism , error: control reaches end of non-void function [-Werror=return-type]
 Patch53: digikam-1.8.0-gcc46.patch