Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2016-01-23 01:13:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-11-04 15:32:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2016-01-23 01:13:31.000000000 +0100 @@ -1,0 +2,14 @@ +Sun Jan 10 15:17:03 UTC 2016 - tittiatc...@gmail.com + +- Add the file digikam-libs.tar.bz2 based on the Digikam 4.13.0 + source file. These are the libs that have moved to KF5 upstream, + but digikam is still KDE4 based. + This should enable to build digikam until the KF5 based version + is released + +------------------------------------------------------------------- +Fri Jan 1 22:10:37 UTC 2016 - nico.kru...@gmail.com + +- re-enable support for MediaWiki export in kipi-plugins + +------------------------------------------------------------------- New: ---- digikam-libs.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.i3TeyH/_old 2016-01-23 01:13:33.000000000 +0100 +++ /var/tmp/diff_new_pack.i3TeyH/_new 2016-01-23 01:13:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package digikam # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -25,6 +25,7 @@ Group: Productivity/Graphics/Viewers Url: http://www.digikam.org/ Source0: http://download.kde.org/stable/%{name}/%{name}-%{rversion}.tar.bz2 +Source1: digikam-libs.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 idoen...@suse.de bnc#711963 -- Remove GPLv2 only files from the build system @@ -38,13 +39,27 @@ BuildRequires: fdupes BuildRequires: flex BuildRequires: gdk-pixbuf-devel +%if 0%{?suse_version} <= 1310 || 0%{?suse_version} == 1320 +BuildRequires: libkdcraw-devel +BuildRequires: libkexiv2-devel +BuildRequires: libkface-devel BuildRequires: libkgeomap-devel +BuildRequires: libksane-devel +BuildRequires: libmediawiki-devel +BuildRequires: pkgconfig(libkipi) >= 2.0.0 +# libkgeomap package provides older lib with same so name. +Requires: libkgeomap2 +%else +BuildRequires: libexiv2-devel +BuildRequires: libmarblewidget-devel +BuildRequires: libraw-devel +BuildRequires: sane-backends-devel +%endif BuildRequires: libxml2-devel BuildRequires: libxslt-devel %if 0%{?suse_version} > 1310 BuildRequires: baloo-devel %endif -BuildRequires: libkface-devel %if 0%{?suse_version} > 1310 BuildRequires: gstreamer-plugins-qt-devel %else @@ -58,16 +73,12 @@ BuildRequires: libgphoto2-devel BuildRequires: libgpod-devel BuildRequires: libjasper-devel -BuildRequires: libkdcraw-devel BuildRequires: libkde4-devel BuildRequires: libkdepimlibs4-devel -BuildRequires: libkexiv2-devel -BuildRequires: pkgconfig(libkipi) >= 2.0.0 %if 0%{?suse_version} > 1230 BuildRequires: libkqoauth-devel %endif BuildRequires: libMagick++-devel -BuildRequires: libksane-devel BuildRequires: libkvkontakte-devel %if 0%{?suse_version} < 1320 && !0%{?is_opensuse} # from 13.2 upwards, and also Leap 42.1 (1315 && is_opensuse) we prefer lcms2 @@ -93,13 +104,14 @@ 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 %requires_ge libkipi8 %kde4_runtime_requires +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +Requires: digikam-libs +%endif %description digiKam is a simple digital photo management application for KDE, which @@ -156,17 +168,35 @@ Recommends: kipi-plugins-lang = %{version} Supplements: packageand(kipi-plugins:marble) %kde4_runtime_requires +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +Requires: digikam-libs +%endif %description -n kipi-plugins A set of plug-ins for the KDE KIPI interface, used by some KDE imaging applications. +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +%package libs +Summary: Libraries required to run digikam +License: GPL-2.0+ +Group: Productivity/Graphics/Viewers +Requires: %{name} = %{version} +#Require the lib for the shared icons +Requires: libKF5Kipi30_0_0 +Requires: marble-data + +%description libs +These are the libraries libkipi, libkdcraw, libkgeomap, libkexiv2, libksane and libkface which are +required for digikam to run. Upstream these libraries have moved to KF5, but digikam is still KDE4 based +%endif + %lang_package %lang_package -n kipi-plugins %prep -%setup -q -n %{name}-%{rversion} +%setup -q -n %{name}-%{rversion} -a 1 %patch0 %patch3 %patch6 -p1 @@ -188,6 +218,11 @@ %else EXTRA_FLAGS="-DENABLE_LCMS2=ON" %endif +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +EXTRA_FLAGS+=" -DDIGIKAMSC_COMPILE_LIBKIPI=ON -DDIGIKAMSC_COMPILE_LIBKEXIV2=ON -DDIGIKAMSC_COMPILE_LIBKDCRAW=ON" +EXTRA_FLAGS+=" -DDIGIKAMSC_COMPILE_LIBKSANE=ON -DDIGIKAMSC_COMPILE_LIBKFACE=ON" +EXTRA_FLAGS+=" -DDIGIKAMSC_COMPILE_LIBKGEOMAP=ON -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON" +%endif %cmake_kde4 -d build -- -DENABLE_MYSQLSUPPORT=TRUE -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=TRUE $EXTRA_FLAGS # there are files in there that are so heavy to the compiler, that one is enough @@ -347,4 +382,35 @@ %{_kde4_modulesdir}/kipiplugin_gpssync.so %{_kde4_servicesdir}/kipiplugin_gpssync.desktop +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%files libs +%defattr(-,root,root) +%_libdir/cmake/Kface-3.5.0/ +%_libdir/cmake/libkexiv2-2.4.0/ +%_libdir/libkdcraw.so* +%_libdir/libkexiv2.so* +%_libdir/libkface.so* +%_libdir/libkgeomap.so* +%_libdir/libkipi.so* +%_libdir/libksane.so* +%_libdir/libmediawiki.so* +%_kde4_iconsdir/hicolor/*/apps/kdcraw.png +# maybe not the best way to do this, but it works and is easier to remove later +%exclude %_kde4_iconsdir/hicolor/*/apps/kipi.png +%_kde4_appsdir/kipi/ +%_kde4_appsdir/libkdcraw/ +%_kde4_appsdir/libkexiv2/ +%_kde4_appsdir/libkface/ +%_kde4_appsdir/libkgeomap/ +%_kde4_servicetypesdir/kipiplugin.desktop +%exclude %_kde4_appsdir/kipi/kipiplugin_* +%exclude %_kde4_appsdir/kipi/tips + +%endif + %changelog
