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

Accepting request 359944 from KDE:Extra

Browse Source 
This SR also includes a change to enable co-installability of the kipi-plugsin5 package. This would allow people to use kipi-plugins for gwenview5 and Spectacle. This SR should stay together with SR#359942 (kipi-plugins5)

OBS-URL: https://build.opensuse.org/request/show/359944
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=145
This commit is contained in:
Dominique Leuenberger 2016-02-22 09:10:03 +00:00 committed by Git OBS Bridge
commit 6806e82a27
2 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
digikam.changes
View File

@ -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

17
digikam.spec
View File

@ -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.*