From 6aa18ea408087e85369bfc1491d6e53a83506fe6 Mon Sep 17 00:00:00 2001
From: Aldas Nabazas <aldas@opensde.net>
Date: Mon, 20 Dec 2010 00:12:50 +0100
Subject: [PATCH] digikam: Updated (1.6.0 -> 1.7.0)

---
 kde/digikam/digikam.desc |  4 ++--
 kde/digikam/mysql.patch  | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 kde/digikam/mysql.patch

diff --git a/kde/digikam/digikam.desc b/kde/digikam/digikam.desc
index a512fb591..5ccf91bdd 100644
--- a/kde/digikam/digikam.desc
+++ b/kde/digikam/digikam.desc
@@ -28,7 +28,7 @@
 
 [L] GPL
 [S] Beta
-[V] 1.6.0
+[V] 1.7.0
 [P] X -----5---9 204.302
 
-[D] 3749554452 digikam-1.6.0.tar.bz2 http://dl.sourceforge.net/sourceforge/digikam/
+[D] 988549333 digikam-1.7.0.tar.bz2 http://dl.sourceforge.net/sourceforge/digikam/
diff --git a/kde/digikam/mysql.patch b/kde/digikam/mysql.patch
new file mode 100644
index 000000000..358efe2cd
--- /dev/null
+++ b/kde/digikam/mysql.patch
@@ -0,0 +1,28 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../digikam/mysql.patch
+# Copyright (C) 2010 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+diff -Nur digikam-1.7.0-orig/CMakeLists.txt digikam-1.7.0/CMakeLists.txt
+--- digikam-1.7.0-orig/CMakeLists.txt	2010-12-19 23:59:40.804061885 +0100
++++ digikam-1.7.0/CMakeLists.txt	2010-12-20 00:00:39.288063218 +0100
+@@ -200,7 +200,7 @@
+ #       under MACOS-X, through macports project, mysql_install_db PERL script is named "mysql_install_db5"
+ FIND_PROGRAM( INITCMD_MYSQL mysql_install_db mysql_install_db5 mysql_install_db.pl
+               PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec
+-                    /opt/mysql/libexec /usr/mysql/bin /opt/mysql/bin ${MYSQL_TOOLS_PATH}
++                    /opt/mysql/libexec /opt/mysql/scripts /usr/mysql/bin /opt/mysql/bin ${MYSQL_TOOLS_PATH}
+                     ENV MYSQL_TOOLS_PATH )
+ MESSAGE(STATUS "Found MySQL install_db executable at: ${INITCMD_MYSQL}")
+