pool/digikam
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 337929 from KDE:Extra

Browse Source 
- Don't buildrequire marble-devel when libkgeomap isn't built

- Align build of Leap 42.1 with the one in Tumbleweed (do not build
  libkface3 and libkgeomap2).

OBS-URL: https://build.opensuse.org/request/show/337929
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=141
This commit is contained in:
Stephan Kulow 2015-10-12 08:01:30 +00:00 committed by Git OBS Bridge
commit 38e949cb32
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
digikam.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Oct 11 12:55:49 UTC 2015 - hrvoje.senjan@gmail.com
- Don't buildrequire marble-devel when libkgeomap isn't built
-------------------------------------------------------------------
Tue Oct 6 13:44:26 UTC 2015 - dimstar@opensuse.org
- Align build of Leap 42.1 with the one in Tumbleweed (do not build
libkface3 and libkgeomap2).
-------------------------------------------------------------------
Wed Sep 9 09:48:14 UTC 2015 - nico.kruber@gmail.com

34
digikam.spec
View File

@ -44,7 +44,8 @@ BuildRequires: flex
BuildRequires: gdk-pixbuf-devel
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
%if 0%{?suse_version} > 1320
%if 0%{?suse_version} >= 1320 || 0%{?is_opensuse}
# We want libkgeomap on openSUSE 13.2+ and Leap, which is 1315 && is_opensuse
BuildRequires: libkgeomap-devel
%endif
%if 0%{?suse_version} > 1310
@ -77,7 +78,8 @@ BuildRequires: libkqoauth-devel
BuildRequires: libMagick++-devel
BuildRequires: libksane-devel
BuildRequires: libkvkontakte-devel
%if 0%{?suse_version} < 1320
%if 0%{?suse_version} < 1320 && !0%{?is_opensuse}
# from 13.2 upwards, and also Leap 42.1 (1315 && is_opensuse) we prefer lcms2
BuildRequires: liblcms-devel
%else
BuildRequires: liblcms2-devel
@ -88,7 +90,9 @@ BuildRequires: libqca2-devel
BuildRequires: libqjson-devel
BuildRequires: libusb-1_0-devel
BuildRequires: libusb-compat-devel
%if 0%{?suse_version} <= 1320 && !0%{?is_opensuse}
BuildRequires: marble-devel
%endif
BuildRequires: opencv-devel >= 2.4.5
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(glu)
@ -166,7 +170,8 @@ Supplements: packageand(kipi-plugins:marble)
A set of plug-ins for the KDE KIPI interface, used by some KDE imaging
applications.
%if 0%{?suse_version} <= 1320
%if 0%{?suse_version} <= 1320 && !0%{?is_opensuse}
# This is only being built up to 13.2 & SLE12, but NOT for Leap 42.1
%package -n libkgeomap-devel
Summary: Development files for libkgeomap
License: GPL-2.0+
@ -198,7 +203,8 @@ Currently supported map engine are:
This library is used by kipi-plugins, digiKam and other kipi host programs.
%endif
%if 0%{?suse_version} < 1320
%if 0%{?suse_version} < 1320 && !0%{?is_opensuse}
# This is built up to openSUSE 13.1 plus also SLE12
%package -n libkface-devel
Summary: Development files for libkface
License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT
@ -248,14 +254,14 @@ This package contains the development files for libmediawiki.
%lang_package -n kipi-plugins
%if 0%{?suse_version} <= 1320
%if 0%{?suse_version} <= 1320 && !0%{?is_opensuse}
%lang_package -n libkgeomap
%endif
%prep
%setup -q -n %{name}-%{rversion}
%if 0%{?suse_version} <= 1320
# Don't unpack the libkgeomap translations for Tumbleweed as that they are being delivered through kde-l10n
%if 0%{?suse_version} <= 1320 && !0%{?is_opensuse}
# Don't unpack the libkgeomap translations for Tumbleweed/Leap 42.1 as that they are being delivered through kde-l10n
tar -xjf %{SOURCE2}
%endif
%patch0
@ -275,12 +281,12 @@ rm gpssync/borrowed/modeltest.h
popd
%build
%if 0%{?suse_version} < 1320
%if 0%{?suse_version} < 1320 && !0%{?is_opensuse}
EXTRA_FLAGS="-DENABLE_LCMS2=OFF -DDIGIKAMSC_COMPILE_LIBKFACE=TRUE"
%else
EXTRA_FLAGS="-DENABLE_LCMS2=ON"
%endif
%if 0%{?suse_version} <= 1320
%if 0%{?suse_version} <= 1320 && !0%{?is_opensuse}
%cmake_kde4 -d build -- -DENABLE_MYSQLSUPPORT=TRUE -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=TRUE -DDIGIKAMSC_COMPILE_LIBKGEOMAP=TRUE -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=TRUE $EXTRA_FLAGS
%else
%cmake_kde4 -d build -- -DENABLE_MYSQLSUPPORT=TRUE -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=TRUE -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=TRUE $EXTRA_FLAGS
@ -311,7 +317,7 @@ rm -fv %{buildroot}%{_kde4_libdir}/*.a
%find_lang %{name}
%if 0%{?suse_version} <= 1320
%if 0%{?suse_version} <= 1320 && !0%{?is_opensuse}
%find_lang libkgeomap libkgeomap.lang
%endif
@ -351,13 +357,13 @@ popd
%postun -n kipi-plugins -p /sbin/ldconfig
%if 0%{?suse_version} <= 1320
%if 0%{?suse_version} <= 1320 && !0%{?is_opensuse}
%post -n libkgeomap2 -p /sbin/ldconfig
%postun -n libkgeomap2 -p /sbin/ldconfig
%endif
%if 0%{?suse_version} < 1320
%if 0%{?suse_version} < 1320 && !0%{?is_opensuse}
%post -n libkface3 -p /sbin/ldconfig
%postun -n libkface3 -p /sbin/ldconfig
@ -463,7 +469,7 @@ popd
%{_kde4_modulesdir}/kipiplugin_gpssync.so
%{_kde4_servicesdir}/kipiplugin_gpssync.desktop
%if 0%{?suse_version} <= 1320
%if 0%{?suse_version} <= 1320 && !0%{?is_opensuse}
%files -n libkgeomap-devel
%defattr(-,root,root,-)
%doc extra/libkgeomap/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,README,TODO}
@ -481,7 +487,7 @@ popd
%{_kde4_libdir}/libkgeomap.so.2*
%endif
%if 0%{?suse_version} < 1320
%if 0%{?suse_version} < 1320 && !0%{?is_opensuse}
%files -n libkface3
%defattr(-,root,root,-)
%{_kde4_appsdir}/libkface