Accepting request 235336 from KDE:Extra

-------------------------------------------------------------------

- Build with lcm2 for openSUSE 13.2 and newer

-------------------------------------------------------------------

- Update to 4.0.0 final
  * Final release. see NEWS file for more details

OBS-URL: https://build.opensuse.org/request/show/235336
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=122
This commit is contained in:
Stephan Kulow 2014-05-26 12:40:25 +00:00 committed by Git OBS Bridge
commit 6ad463c7d5
4 changed files with 27 additions and 7 deletions

View File

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

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

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

View File

@ -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 Wed May 7 17:11:30 UTC 2014 - hrvoje.senjan@gmail.com

View File

@ -17,14 +17,14 @@
Name: digikam Name: digikam
Version: 4.0.0~rc Version: 4.0.0
Release: 0 Release: 0
%define rversion 4.0.0-rc %define rversion 4.0.0
Summary: A KDE Photo Manager Summary: A KDE Photo Manager
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Graphics/Viewers Group: Productivity/Graphics/Viewers
Url: http://www.digikam.org/ 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 # PATCH-FIX-OPENSUSE digikam-buildtime.patch -- Remove build time references so build-compare can do its work
Patch0: digikam-buildtime.patch Patch0: digikam-buildtime.patch
# PATCH-FIX-OPENSUSE remove-gplv2-only.patch idoenmez@suse.de bnc#711963 -- Remove GPLv2 only files from the build system # 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: libMagick++-devel
BuildRequires: libksane-devel BuildRequires: libksane-devel
BuildRequires: libkvkontakte-devel BuildRequires: libkvkontakte-devel
%if 0%{?suse_version} < 1320
BuildRequires: liblcms-devel BuildRequires: liblcms-devel
%else
BuildRequires: liblcms2-devel
%endif
BuildRequires: liblqr-devel BuildRequires: liblqr-devel
BuildRequires: libpgf-devel BuildRequires: libpgf-devel
BuildRequires: libqca2-devel BuildRequires: libqca2-devel
@ -243,7 +247,12 @@ rm gpssync/borrowed/modeltest.h
popd popd
%build %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 # there are files in there that are so heavy to the compiler, that one is enough
%make_jobs VERBOSE=1 %make_jobs VERBOSE=1