From 48756053a7b60cb268c1369f2e623938239d900e9fe86a9a0b40f568ca06fb88 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 22 Feb 2016 09:10:03 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/digikam revision 145.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=d097d4f7b57ca25eaa6095d6a63ae3ca --- digikam.changes | 34 ++++++++++++++++++++++++++++++++++ digikam.spec | 17 +++++++++++++---- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/digikam.changes b/digikam.changes index 6ad1033..fea0b00 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Wed Feb 17 10:17:03 UTC 2016 - tittiatcoke@gmail.com + +- Remove the kipi-plugin icons to enable co-installability with the + kipi-plugins5 package. The required icons are now shipped in a + seperate package kipi-plugin-icons, which is provided by the + kipi-plugins5 package (boo#966939) + +------------------------------------------------------------------- +Wed Feb 10 08:17:03 UTC 2016 - tittiatcoke@gmail.com + +- Drop the requires on digikam from the digikam-libs package. This + would allow digikam-libs to replace the existing libkipi, libkexiv2, + etc without pulling in digikam/kipi-plugins (boo#965865) + +------------------------------------------------------------------- +Wed Feb 3 19:17:03 UTC 2016 - tittiatcoke@gmail.com + +- Drop the BuildRequire on kdepimlibs4 for Factory + +- Make the dependency on marble-data from digikam-libs a recommends + to allow more flexibility for users + +------------------------------------------------------------------- +Sat Jan 30 22:18:07 UTC 2016 - wbauer@tmo.at + +- Provide/Obsolete libkexiv2-11 instead of libkexiv2, that's the + actual name of the package + +------------------------------------------------------------------- +Sat Jan 30 14:39:32 UTC 2016 - wbauer@tmo.at + +- Provide/Obsolete libkdcraw23 as well to prevent update problems + ------------------------------------------------------------------- Fri Jan 29 16:56:31 UTC 2016 - dimstar@opensuse.org diff --git a/digikam.spec b/digikam.spec index caa54a1..1c02fdf 100644 --- a/digikam.spec +++ b/digikam.spec @@ -75,7 +75,9 @@ BuildRequires: libgphoto2-devel BuildRequires: libgpod-devel BuildRequires: libjasper-devel BuildRequires: libkde4-devel +%if 0%{?suse_version} < 1320 BuildRequires: libkdepimlibs4-devel +%endif %if 0%{?suse_version} > 1230 BuildRequires: libkqoauth-devel %endif @@ -219,8 +221,10 @@ Supplements: packageand(kipi-plugins:marble) %kde4_runtime_requires %if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 Requires: digikam-libs +Requires: kipi-plugin-icons %endif + %description -n kipi-plugins A set of plug-ins for the KDE KIPI interface, used by some KDE imaging applications. @@ -230,12 +234,13 @@ applications. 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 -Obsoletes: libkexiv2 < %{libversion} -Provides: libkexiv2 = %{libversion} +Recommends: marble-data +Obsoletes: libkdcraw23 < %{libversion} +Provides: libkdcraw23 = %{libversion} +Obsoletes: libkexiv2-11 < %{libversion} +Provides: libkexiv2-11 = %{libversion} Obsoletes: libkface3 < %{libversion} Provides: libkface3 = %{libversion} Obsoletes: libkgeomap2 < %{libversion} @@ -442,7 +447,11 @@ popd %{_kde4_configkcfgdir}/photolayoutseditor.kcfg %dir %{_kde4_iconsdir}/hicolor/24x24/apps %{_kde4_iconsdir}/hicolor/*/actions/*.* +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +%exclude %{_kde4_iconsdir}/hicolor/*/apps/kipi-*.* +%else %{_kde4_iconsdir}/hicolor/*/apps/kipi-*.* +%endif %exclude %{_kde4_iconsdir}/hicolor/*/apps/kipi-gpsimagetag.png %{_kde4_iconsdir}/hicolor/*/apps/photolayoutseditor.* %{_kde4_iconsdir}/hicolor/*/apps/rawconverter.*