From 21bf4f6e3c88ba2c137d2ec23024627c291f9c16d3a5a3648320f6400c8bd04c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 26 May 2014 12:40:25 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/digikam revision 122.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=ad1fd8ec166a2c53d754cdde0bbb17ce --- digikam-4.0.0-rc.tar.bz2 | 3 --- digikam-4.0.0.tar.bz2 | 3 +++ digikam.changes | 11 +++++++++++ digikam.spec | 17 +++++++++++++---- 4 files changed, 27 insertions(+), 7 deletions(-) delete mode 100644 digikam-4.0.0-rc.tar.bz2 create mode 100644 digikam-4.0.0.tar.bz2 diff --git a/digikam-4.0.0-rc.tar.bz2 b/digikam-4.0.0-rc.tar.bz2 deleted file mode 100644 index 562f0a6..0000000 --- a/digikam-4.0.0-rc.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0107d87524fc182de119cb84c3c90d91fbb86dd70f41676ea834e897efa8b4b4 -size 67688703 diff --git a/digikam-4.0.0.tar.bz2 b/digikam-4.0.0.tar.bz2 new file mode 100644 index 0000000..963db01 --- /dev/null +++ b/digikam-4.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:984f7a47a3fdd5b5b30991b436848ed420fbcfffa01ffaa3abdf7202848b17ae +size 68931371 diff --git a/digikam.changes b/digikam.changes index 94b1e2e..527c811 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue May 20 12:32:42 UTC 2014 - hrvoje.senjan@gmail.com + +- Build with lcm2 for openSUSE 13.2 and newer + +------------------------------------------------------------------- +Wed May 14 08:35:51 UTC 2014 - tittiatcoke@gmail.com + +- Update to 4.0.0 final + * Final release. see NEWS file for more details + ------------------------------------------------------------------- Wed May 7 17:11:30 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/digikam.spec b/digikam.spec index a0b22e1..aa04f63 100644 --- a/digikam.spec +++ b/digikam.spec @@ -17,14 +17,14 @@ Name: digikam -Version: 4.0.0~rc +Version: 4.0.0 Release: 0 -%define rversion 4.0.0-rc +%define rversion 4.0.0 Summary: A KDE Photo Manager License: GPL-2.0+ Group: Productivity/Graphics/Viewers Url: http://www.digikam.org/ -Source0: http://download.kde.org/unstable/%{name}/%{name}-%{rversion}.tar.bz2 +Source0: http://download.kde.org/stable/%{name}/%{name}-%{rversion}.tar.bz2 # PATCH-FIX-OPENSUSE digikam-buildtime.patch -- Remove build time references so build-compare can do its work Patch0: digikam-buildtime.patch # PATCH-FIX-OPENSUSE remove-gplv2-only.patch idoenmez@suse.de bnc#711963 -- Remove GPLv2 only files from the build system @@ -65,7 +65,11 @@ BuildRequires: libkqoauth-devel BuildRequires: libMagick++-devel BuildRequires: libksane-devel BuildRequires: libkvkontakte-devel +%if 0%{?suse_version} < 1320 BuildRequires: liblcms-devel +%else +BuildRequires: liblcms2-devel +%endif BuildRequires: liblqr-devel BuildRequires: libpgf-devel BuildRequires: libqca2-devel @@ -243,7 +247,12 @@ rm gpssync/borrowed/modeltest.h popd %build -%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=FALSE -DENABLE_INTERNALMYSQL=FALSE +%if 0%{?suse_version} < 1320 +EXTRA_FLAGS="-DENABLE_LCMS2=OFF" +%else +EXTRA_FLAGS="-DENABLE_LCMS2=ON" +%endif +%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=FALSE -DENABLE_INTERNALMYSQL=FALSE $EXTRA_FLAGS # there are files in there that are so heavy to the compiler, that one is enough %make_jobs VERBOSE=1