Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2015-10-12 10:01:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam" Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2015-09-17 09:16:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2015-10-12 10:01:37.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Oct 11 12:55:49 UTC 2015 - [email protected] + +- Don't buildrequire marble-devel when libkgeomap isn't built + +------------------------------------------------------------------- +Tue Oct 6 13:44:26 UTC 2015 - [email protected] + +- Align build of Leap 42.1 with the one in Tumbleweed (do not build + libkface3 and libkgeomap2). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.eUVDvT/_old 2015-10-12 10:01:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eUVDvT/_new 2015-10-12 10:01:40.000000000 +0200 @@ -44,7 +44,8 @@ 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: 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: 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 @@ 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 @@ 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 @@ %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 @@ 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 @@ %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 @@ %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 @@ %{_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 @@ %{_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
