[kdegraphics] libjpeg version hardcoded to 62 (gwenview libs)

[Jaroslav Reznik]

commit fba7b5a5bc63825470e06abe2fc1a90686b3c8cd
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Fri Jan 21 18:24:20 2011 +0100

    libjpeg version hardcoded to 62 (gwenview libs)

 kdegraphics-4.6.0-libjpeg-version.patch |   25 +++++++++++++++++++++++++
 kdegraphics.spec                        |    6 ++++++
 2 files changed, 31 insertions(+), 0 deletions(-)
---
diff --git a/kdegraphics-4.6.0-libjpeg-version.patch b/kdegraphics-4.6.0-libjpeg-version.patch
new file mode 100644
index 0000000..d862bbd
--- /dev/null
+++ b/kdegraphics-4.6.0-libjpeg-version.patch
@@ -0,0 +1,25 @@
+diff -up kdegraphics-4.6.0/gwenview/lib/CMakeLists.txt.libjpeg-version kdegraphics-4.6.0/gwenview/lib/CMakeLists.txt
+--- kdegraphics-4.6.0/gwenview/lib/CMakeLists.txt.libjpeg-version	2011-01-18 22:25:18.000000000 +0100
++++ kdegraphics-4.6.0/gwenview/lib/CMakeLists.txt	2011-01-21 18:19:17.754543808 +0100
+@@ -1,19 +1,8 @@
+ project(gwenviewlib)
+ 
+-# Extract version of libjpeg so that we can use the appropriate dir
+-# See bug #227313
+-file(READ "${JPEG_INCLUDE_DIR}/jpeglib.h" jpeglib_h_content)
+-string(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jpeglib_version "${jpeglib_h_content}")
+-message(STATUS "libjpeg version: ${jpeglib_version}")
+-
+-if ("${jpeglib_version}" LESS 80)
+-	set(GV_JPEG_DIR libjpeg-62)
+-else ("${jpeglib_version}" LESS 80)
+-	set(GV_JPEG_DIR libjpeg-80)
+-endif ("${jpeglib_version}" LESS 80)
+-
++# hardcode libjpeg version to 62
+ include_directories(
+-	${CMAKE_CURRENT_SOURCE_DIR}/${GV_JPEG_DIR}
++	${CMAKE_CURRENT_SOURCE_DIR}/libjpeg-62
+ 	${CMAKE_CURRENT_SOURCE_DIR}/..
+ 	${CMAKE_CURRENT_BINARY_DIR}
+ 	${SOPRANO_INCLUDE_DIR}
diff --git a/kdegraphics.spec b/kdegraphics.spec
index 2439aad..603e422 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -27,6 +27,9 @@ URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegraphics-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# libjpeg-turbo splits version definition to jconfig.h, hardcode 62 for now
+Patch1:  kdegraphics-4.6.0-libjpeg-version.patch
+
 ## upstreamable patches
 # okular.desktop : Categories=-Office,+VectorGraphics (http://bugzilla.redhat.com/591089)
 Patch50: kdegraphics-4.5.1-okular_dt.patch
@@ -127,6 +130,8 @@ Summary: A kioslave for displaying WinHelp files
 %prep
 %setup -q -n kdegraphics-%{version}%{?alphatag}
 
+%patch1 -p1 -b .libjpeg-version
+
 %patch50 -p1 -b .okular_dt
 %patch51 -p1 -b .OkularConfig
 
@@ -280,6 +285,7 @@ fi
 %changelog
 * Fri Jan 21 2011 Jaroslav Reznik <jreznik at redhat.com> - 7:4.6.0-1
 - 4.6.0
+- hardcode libjpeg version to 62
 
 * Wed Jan 05 2011 Jaroslav Reznik <jreznik at redhat.com> - 7:4.5.95-1
 - 4.5.95 (4.6rc2)