Accepting request 82072 from KDE:Distro:Factory

- Add disable-unsupported-cmake-policy.patch to remove unsupported
  cmake policy setup, fixes openSUSE 11.4 build

- update to version 2.1.0
  * Mainly bug fix release
  * CameraGUI improvements
- new libkvkontakte may need to be splitted into own package as well

OBS-URL: https://build.opensuse.org/request/show/82072
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=77
This commit is contained in:
Sascha Peilicke 2011-09-14 12:00:36 +00:00 committed by Git OBS Bridge
parent b4016ac643
commit 185b44c545
7 changed files with 39 additions and 28 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c7d19f0562a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234
size 53906557

3
digikam-2.1.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:33b35c85b3f7820771a05f4a4e3f22961bbab6402e5159d07c2080158d55cba7
size 53911470

View File

@ -1,13 +1,14 @@
--- CMakeLists.txt 2011-07-28 01:31:23.000000000 +0200
+++ CMakeLists.txt 2011-07-28 11:48:51.084119958 +0200
@@ -73,11 +73,6 @@
--- CMakeLists.txt.orig 2011-09-07 14:10:20.000000000 +0200
+++ CMakeLists.txt 2011-09-09 15:30:52.649954215 +0200
@@ -79,12 +79,8 @@
SET(KSANE_LOCAL_DIR extra/libksane)
ENDIF()
-SET(KFACE_LOCAL_DIR extra/libkface)
-SET(KGEOMAP_LOCAL_DIR extra/libkgeomap)
-SET(MEDIAWIKI_LOCAL_DIR extra/libmediawiki)
-
SET(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte)
-ADD_SUBDIRECTORY(extra)
ADD_SUBDIRECTORY(core)
ADD_SUBDIRECTORY(doc)

View File

@ -1,18 +0,0 @@
--- core/digikam/CMakeLists.txt 2011-07-28 01:28:25.000000000 +0200
+++ core/digikam/CMakeLists.txt 2011-08-26 10:10:07.010025844 +0200
@@ -278,13 +278,14 @@
${STRIGI_LIBRARIES}
${LCMS_LIBRARIES}
- ${GPHOTO2_LIBRARIES}
digikamcore
digikamdatabase
advancedrename
queuemanager
cameragui
+
+ ${GPHOTO2_LIBRARIES}
)
IF (NOT WIN32 AND GPHOTO2_FOUND)

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Sun Sep 11 17:03:43 UTC 2011 - idonmez@suse.com
- Add disable-unsupported-cmake-policy.patch to remove unsupported
cmake policy setup, fixes openSUSE 11.4 build
-------------------------------------------------------------------
Fri Sep 9 13:10:04 UTC 2011 - adrian@suse.de
- update to version 2.1.0
* Mainly bug fix release
* CameraGUI improvements
- new libkvkontakte may need to be splitted into own package as well
-------------------------------------------------------------------
Mon Sep 5 08:16:18 UTC 2011 - coolo@suse.com

View File

@ -18,7 +18,7 @@
Name: digikam
Version: 2.0.0
Version: 2.1.0
Release: 7
License: GPL-2.0+
Summary: A KDE Photo Manager
@ -31,8 +31,8 @@ Patch0: digikam-buildtime.patch
Patch1: add_mimetype_bnc629393.diff
# PATCH-FIX-OPENSUSE digikam-external-libs.patch -- Compile with external libs
Patch2: digikam-external-libs.patch
# PATCH-FIX-UPSTREAM digikam-link-order.patch bko #258931 idoenmez@suse.de -- Fix library link order
Patch3: digikam-link-order.patch
# PATCH-FIX-OPENSUSE disable-unsupported-cmake-policy.patch idoenmez@suse.de -- Remove unsupported cmake policy
Patch3: disable-unsupported-cmake-policy.patch
BuildRequires: boost-devel
BuildRequires: doxygen
BuildRequires: fdupes

View File

@ -0,0 +1,14 @@
--- CMakeLists.txt 2011-09-07 14:10:20.000000000 +0200
+++ CMakeLists.txt 2011-09-11 19:03:11.217931980 +0200
@@ -24,11 +24,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-if(POLICY CMP0011)
- cmake_policy(SET CMP0017 NEW)
-endif(POLICY CMP0011)
-
-
PROJECT(digikam-sc)
IF(KDE4_BUILD_TESTS)