[digikam] - digikam-1.4.0

[Rex Dieter]

commit 8f6bea61e85a8d491b262b1537813d9518cfc839
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Aug 25 14:38:18 2010 -0500

    - digikam-1.4.0

 .gitignore                              |    1 +
 digikam-1.4.0_marble_plugin_rpath.patch |   14 ++++++++++++++
 digikam.spec                            |   28 ++++++++++++++++------------
 sources                                 |    2 +-
 4 files changed, 32 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1fbee41..521015a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 digikam-1.3.0.tar.bz2
+/digikam-1.4.0.tar.bz2
diff --git a/digikam-1.4.0_marble_plugin_rpath.patch b/digikam-1.4.0_marble_plugin_rpath.patch
new file mode 100644
index 0000000..ac8761b
--- /dev/null
+++ b/digikam-1.4.0_marble_plugin_rpath.patch
@@ -0,0 +1,14 @@
+diff -up digikam-1.4.0/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt.rpath digikam-1.4.0/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
+diff -up digikam-1.4.0/libs/imageproperties/markerclusterholderplugin/MarbleMacros.cmake.rpath digikam-1.4.0/libs/imageproperties/markerclusterholderplugin/MarbleMacros.cmake
+--- digikam-1.4.0/libs/imageproperties/markerclusterholderplugin/MarbleMacros.cmake.rpath	2010-08-22 03:53:08.000000000 -0500
++++ digikam-1.4.0/libs/imageproperties/markerclusterholderplugin/MarbleMacros.cmake	2010-08-25 14:22:27.973423652 -0500
+@@ -38,8 +38,7 @@ endif( QTONLY )
+ set_target_properties( ${_target_name} PROPERTIES 
+                        INSTALL_RPATH_USE_LINK_PATH TRUE  
+                        SKIP_BUILD_RPATH TRUE 
+-                       BUILD_WITH_INSTALL_RPATH TRUE 
+-                       INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${LIB_SUFFIX} )
++                       BUILD_WITH_INSTALL_RPATH TRUE )
+ 
+ endmacro( marble_add_plugin _target_name )
+ 
diff --git a/digikam.spec b/digikam.spec
index b78ec4d..a727089 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,6 +1,6 @@
 
 Name:	 digikam
-Version: 1.3.0
+Version: 1.4.0
 Release: 1%{?dist}
 Summary: A digital camera accessing & photo management application
 
@@ -14,39 +14,38 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # TODO: upstream me
 Source1: digikam-import.desktop
 
+## upstreamable patches
+Patch50: digikam-1.4.0_marble_plugin_rpath.patch
+
 ## upstream patches
 
 BuildRequires: desktop-file-utils
+BuildRequires: doxygen
 BuildRequires: gettext
 BuildRequires: glib2-devel
 BuildRequires: gphoto2-devel
-BuildRequires: libkdcraw-devel >= 1.1.0 
-BuildRequires: libkexiv2-devel >= 1.1.0 
-BuildRequires: libkipi-devel >= 0.3.0
-BuildRequires: liblqr-1-devel
 BuildRequires: jasper-devel
-
 # marble integration, http://bugzilla.redhat.com/470578 
 %define marble_version 4.3.0
 BuildRequires: kdeedu-devel >= %{marble_version} 
-
 BuildRequires: kdelibs4-devel
-
-# trash protocol support needed
-# FIXME: should probably be handled lower in the stack
-Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
-
 BuildRequires: kdepimlibs-devel
 BuildRequires: lcms-devel
 BuildRequires: lensfun-devel
+BuildRequires: libkdcraw-devel >= 1.1.0
+BuildRequires: libkexiv2-devel >= 1.1.0
+BuildRequires: libkipi-devel >= 0.3.0
+BuildRequires: liblqr-1-devel
 BuildRequires: libtiff-devel
 BuildRequires: libpng-devel >= 1.2.7
+BuildRequires: mysql-devel mysql-server
 BuildRequires: soprano-devel
 BuildRequires: sqlite-devel
 
 Obsoletes: digikamimageplugins < 0.9.1-2
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
 
 %description
 digiKam is an easy to use and powerful digital photo management application,
@@ -81,6 +80,8 @@ needed to develop applications using %{name}.
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
+%patch50 -p1 -b .marble_plugin_rpath
+
 
 %build
 
@@ -163,6 +164,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 25 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.4.0-1
+- digikam-1.4.0
+
 * Tue Jun 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.3.0-1
 - digikam-1.3.0
 
diff --git a/sources b/sources
index 0006456..3f3e3ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-25d09fdab2b2450c6c6075aab3377fce  digikam-1.3.0.tar.bz2
+748518d6b24cc2c44acad5cb9df8d21a  digikam-1.4.0.tar.bz2