Accepting request 628957 from KDE:Extra

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

digikam.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 13 09:00:10 UTC 2018 - fabian@ritter-vogt.de
+
+- Require libQt5Sql5-sqlite (boo#1095688)
+- Use %license
+
 -------------------------------------------------------------------
 Sat Mar 24 18:48:15 UTC 2018 - wbauer@tmo.at
 

digikam.spec

@@ -20,7 +20,7 @@ Name:           digikam
 Version:        5.9.0
 Release:        0
 Summary:        A KDE Photo Manager
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Graphics/Viewers
 Url:            http://www.digikam.org/
 Source0:        http://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
@@ -34,6 +34,7 @@ Patch2:         0002-Revert-replace-obsolete-qSort-function.patch
 %ifarch %ix86 x86_64 %arm aarch64 mips mips64
 BuildRequires:  akonadi-contact-devel
 %endif
+BuildRequires:  QtAV-devel >= 1.11
 BuildRequires:  baloo5-devel
 BuildRequires:  bison
 BuildRequires:  boost-devel
@@ -53,7 +54,6 @@ BuildRequires:  libeigen3-devel
 BuildRequires:  libexiv2-devel >= 0.26
 BuildRequires:  libexpat-devel
 BuildRequires:  libgcrypt-devel
-BuildRequires:  QtAV-devel >= 1.11
 BuildRequires:  libgpod-devel
 BuildRequires:  libjasper-devel
 BuildRequires:  libkdcraw-devel >= 15.12.0
@@ -88,6 +88,7 @@ BuildRequires:  pkgconfig(Qt5X11Extras)
 BuildRequires:  pkgconfig(Qt5XmlPatterns)
 BuildRequires:  pkgconfig(libgphoto2) >= 2.4.0
 Requires:       kipi-plugins >= %{version}
+Requires:       libQt5Sql5-sqlite
 Recommends:     %{name}-doc
 Recommends:     %{name}-lang
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -116,7 +117,7 @@ delete your images, is provided.
 
 %package doc
 Summary:        Documentation of Digikam
-License:        GFDL-1.2
+License:        GFDL-1.2-only
 Group:          Documentation/HTML
 BuildArch:      noarch
 
@@ -125,7 +126,7 @@ This package contains the documentation for digikam
 
 %package -n kipi-plugins
 Summary:        KDE Plug-Ins for Image Manipulation
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Graphics/Other
 Recommends:     ImageMagick
 Recommends:     enblend-enfuse
@@ -144,7 +145,7 @@ applications.
 
 %package -n showfoto
 Summary:        DigiKam: Showfoto
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Graphics/Viewers
 Supplements:    %{name}
 
@@ -153,7 +154,7 @@ Additional program to browse and view photos
 
 %package -n libdigikamcore5
 Summary:        The main digikam libraries
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Development/Libraries/KDE
 
 %description -n libdigikamcore5
@@ -226,8 +227,6 @@ done
 %postun -n kipi-plugins -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
-%doc core/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,ChangeLog,NEWS,README.md}
 %{_bindir}/digikam
 %{_bindir}/digitaglinktree
 %{_bindir}/cleanup_digikamdb
@@ -245,7 +244,6 @@ done
 %_kf5_iconsdir/hicolor/*/apps/panorama.*
 
 %files -n showfoto
-%defattr(-,root,root)
 %{_bindir}/showfoto
 %{_kf5_applicationsdir}/org.kde.showfoto.desktop
 %_kf5_iconsdir/hicolor/*/apps/showfoto.*
@@ -254,22 +252,21 @@ done
 %{_kf5_appstreamdir}/org.kde.showfoto.appdata.xml
 
 %files -n libdigikamcore5
-%defattr(-,root,root)
+%license COPYING*
+%doc core/{AUTHORS,ChangeLog,NEWS,README.md}
 %{_libdir}/libdigikam*.so*
 
 %files doc
-%defattr(-,root,root,-)
+%license doc/COPYING.DOC
-%doc doc/COPYING.DOC
 %doc %{_mandir}/man1/cleanup_digikamdb.1%{ext_man}
 %doc %{_mandir}/man1/digitaglinktree.1%{ext_man}
 %doc %{_kf5_htmldir}/*/
 
 %files lang -f %{name}.lang
-%defattr(-,root,root,-)
 
 %files -n kipi-plugins
-%defattr(-,root,root,-)
+%license COPYING*
-%doc extra/kipi-plugins/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,ChangeLog,NEWS,README,TODO}
+%doc extra/kipi-plugins/{AUTHORS,ChangeLog,NEWS,README,TODO}
 %_libdir/libKF5kipiplugins.so*
 %{_kf5_plugindir}/kipiplugin_*.so
 %{_kf5_applicationsdir}/kipiplugins.desktop
@@ -279,6 +276,5 @@ done
 %{_kf5_kxmlguidir}/kipi/
 
 %files -n kipi-plugins-lang -f kipiplugin.lang
-%defattr(-,root,root,-)
 
 %changelog