From f689894ceb06d4a6e8a59612a575a945d925777a4d190354cfea57769cd6343d Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sun, 25 Jan 2015 20:16:03 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/digikam revision 134.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=4303834440e8867600a348844d30c2a4 --- digikam.changes | 6 ++++++ digikam.spec | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/digikam.changes b/digikam.changes index 8a21e7d..8a1bc2a 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jan 24 15:44:27 UTC 2015 - adrian@suse.de + +- old libkgeomap package provides older lib with same so name, adding + an explizit requires + ------------------------------------------------------------------- Thu Jan 15 14:09:02 UTC 2015 - tittiatcoke@gmail.com diff --git a/digikam.spec b/digikam.spec index 90a4bf0..d799577 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,7 +1,7 @@ # # spec file for package digikam # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -95,6 +95,8 @@ BuildRequires: update-desktop-files Requires: kipi-plugins >= %{version} Requires: libqt4-sql-mysql Requires: libqt4-sql-sqlite +# libkgeomap package provides older lib with same so name. +Requires: libkgeomap2 Recommends: %{name}-doc Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -269,7 +271,7 @@ EXTRA_FLAGS="-DENABLE_LCMS2=OFF -DDIGIKAMSC_COMPILE_LIBKFACE=TRUE" EXTRA_FLAGS="-DENABLE_LCMS2=ON" %endif %cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=TRUE -DDIGIKAMSC_COMPILE_LIBKGEOMAP=TRUE -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=TRUE $EXTRA_FLAGS - + # there are files in there that are so heavy to the compiler, that one is enough %make_jobs VERBOSE=1