Accepting request 356746 from KDE:Extra

1

OBS-URL: https://build.opensuse.org/request/show/356746
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=144

digikam.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Jan 29 16:56:31 UTC 2016 - dimstar@opensuse.org
+
+- Split out the five plugins that upstream ships with a
+  metainfo.xml file: color, decorate, enhance, fxfilters and
+  transform. All new subpackages for now supplement the main
+  package (which is equal to the main package recommending them).
+
+-------------------------------------------------------------------
+Mon Jan 25 11:51:03 UTC 2016 - alarrosa@suse.com
+
+- Add symlinks for solid actions so Plasma5 can use digikam to 
+  import images from the device notifier applet
+
 -------------------------------------------------------------------
 Sun Jan 10 15:17:03 UTC 2016 - tittiatcoke@gmail.com
 

digikam.spec

@@ -20,6 +20,7 @@ Name:           digikam
 Version:        4.14.0
 Release:        0
 %define rversion 4.14.0
+%define libversion 15.12.0
 Summary:        A KDE Photo Manager
 License:        GPL-2.0+
 Group:          Productivity/Graphics/Viewers
@@ -130,6 +131,54 @@ BuildArch:      noarch
 %description doc
 This package contains the documentation for digikam
 
+# split out Image modification plugins. Upstream ships them with a
+# .metainfo.xml file, which is meant to list them as extensions in a
+# Software center. The ones we want installed by default we tag as Supplements(%{name}.
+%package plugin-color
+Summary:        DigiKam: ImagePlugin-Color
+License:        GPL-2.0+
+Group:          Productivity/Graphics/Viewers
+Supplements:    %{name}
+
+%description plugin-color
+A tool to correct colors of image
+
+%package plugin-decorate
+Summary:        DigiKam: ImagePlugin-Decorate
+License:        GPL-2.0+
+Group:          Productivity/Graphics/Viewers
+Supplements:    %{name}
+
+%description plugin-decorate
+A tool to decorate an image
+
+%package plugin-enhance
+Summary:        DigiKam: ImagePlugin-Enhance
+License:        GPL-2.0+
+Group:          Productivity/Graphics/Viewers
+Supplements:    %{name}
+
+%description plugin-enhance
+digiKam plugin to enhance photographs
+
+%package plugin-fxfilters
+Summary:        DigiKam: ImagePlugin-FxFilters
+License:        GPL-2.0+
+Group:          Productivity/Graphics/Viewers
+Supplements:    %{name}
+
+%description plugin-fxfilters
+Special effect filters plugin for digiKam
+
+%package plugin-transform
+Summary:        DigiKam: ImagePlugin-Color
+License:        GPL-2.0+
+Group:          Productivity/Graphics/Viewers
+Supplements:    %{name}
+
+%description plugin-transform
+A tool to transform image geometry
+
 # split out acquireimage plugin in order to allow the main
 # kipi-plugins package to be included on livecd (acquireimage
 # requires sane-backends, which is blocked for livecd)
@@ -185,6 +234,18 @@ Requires:       %{name} = %{version}
 #Require the lib for the shared icons
 Requires:       libKF5Kipi30_0_0
 Requires:       marble-data
+Obsoletes:      libkexiv2 < %{libversion}
+Provides:       libkexiv2 = %{libversion}
+Obsoletes:      libkface3 < %{libversion}
+Provides:       libkface3 = %{libversion}
+Obsoletes:      libkgeomap2 < %{libversion}
+Provides:       libkgeomap2 = %{libversion}
+Obsoletes:      libkipi11 < %{libversion}
+Provides:       libkipi11 = %{libversion}
+Obsoletes:      libksane0 < %{libversion}
+Provides:       libksane0 = %{libversion}
+Obsoletes:      libmediawiki1 < %{libversion}
+Provides:       libmediawiki1 = %{libversion}
 
 %description libs
 These are the libraries libkipi, libkdcraw, libkgeomap, libkexiv2, libksane and libkface which are 
@@ -274,6 +335,14 @@ pushd %{buildroot}%{_kde4_iconsdir}/hicolor/scalable/apps/
 ln -s %{_kde4_iconsdir}/oxygen/scalable/apps/rawconverter.svgz
 popd
 
+# symlink solid actions into place known to Plasma 5, remove once digikam is KF5-based
+mkdir -p %{buildroot}%{_datadir}/solid/actions
+pushd %{buildroot}%{_kde4_appsdir}/solid/actions/
+for i in *.desktop; do
+ln -s %{_kde4_appsdir}/solid/actions/$i %{buildroot}%{_datadir}/solid/actions/
+done
+popd
+
 %fdupes -s %{buildroot}
 
 %kde_post_install
@@ -295,6 +364,9 @@ popd
 %{_kde4_appsdir}/kconf_update/adjustlevelstool.upd
 %{_kde4_appsdir}/showfoto/
 %{_kde4_appsdir}/solid
+%dir %{_datadir}/solid
+%dir %{_datadir}/solid/actions
+%{_datadir}/solid/actions/*.desktop
 %{_kde4_bindir}/cleanup_digikamdb
 %{_kde4_bindir}/digikam
 %{_kde4_bindir}/digitaglinktree
@@ -305,7 +377,6 @@ popd
 %{_kde4_iconsdir}/hicolor/*/apps/showfoto.*
 %{_kde4_libdir}/libdigikamcore.so.*
 %{_kde4_libdir}/libdigikamdatabase.so.*
-%{_kde4_modulesdir}/digikam*.so
 %{_kde4_modulesdir}/kio_digikamalbums.so
 %{_kde4_modulesdir}/kio_digikamdates.so
 %{_kde4_modulesdir}/kio_digikammapimages.so
@@ -316,7 +387,31 @@ popd
 %dir %{_kde4_datadir}/appdata
 %{_kde4_datadir}/appdata/digikam.appdata.xml
 %{_kde4_datadir}/appdata/showfoto.appdata.xml
-%{_kde4_datadir}/appdata/digiKam-ImagePlugin*.metainfo.xml
+
+%files plugin-color
+%defattr(-,root,root)
+%{_kde4_modulesdir}/digikamimageplugin_color.so
+%{_kde4_datadir}/appdata/digiKam-ImagePlugin_Color.metainfo.xml
+
+%files plugin-decorate
+%defattr(-,root,root)
+%{_kde4_modulesdir}/digikamimageplugin_decorate.so
+%{_kde4_datadir}/appdata/digiKam-ImagePlugin_Decorate.metainfo.xml
+
+%files plugin-enhance
+%defattr(-,root,root)
+%{_kde4_modulesdir}/digikamimageplugin_enhance.so
+%{_kde4_datadir}/appdata/digiKam-ImagePlugin_Enhance.metainfo.xml
+
+%files plugin-fxfilters
+%defattr(-,root,root)
+%{_kde4_modulesdir}/digikamimageplugin_fxfilters.so
+%{_kde4_datadir}/appdata/digiKam-ImagePlugin_FxFilters.metainfo.xml
+
+%files plugin-transform
+%defattr(-,root,root)
+%{_kde4_modulesdir}/digikamimageplugin_transform.so
+%{_kde4_datadir}/appdata/digiKam-ImagePlugin_Transform.metainfo.xml
 
 %files doc
 %defattr(-,root,root,-)