Accepting request 1079881 from KDE:Extra

Update to 8.0.0

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

0001-fix-compile-DNG-SDK-with-GCC13.patch

@@ -1,25 +0,0 @@
-From f7bad0e9c979a5d700aababa37eac3633d52816b Mon Sep 17 00:00:00 2001
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Sun, 26 Mar 2023 13:19:40 +0200
-Subject: [PATCH] fix compile DNG-SDK with GCC13
-
----
- core/libs/dngwriter/extra/dng_sdk/dng_string.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp b/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
-index fa58711..dbd7e17 100644
---- a/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
-+++ b/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
-@@ -23,7 +23,7 @@
- #include <windows.h>
- #endif
- 
--#if qiPhone || qAndroid
-+#if qLinux || qiPhone || qAndroid
- #include <ctype.h> // for isdigit
- #endif
- 
--- 
-2.40.0
-

digiKam-7.10.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a3f30f01b7d1b6d585822bcd5ebf8df69e0ff024563a72462ebf8069dbda22e1
-size 349238192

digiKam-7.10.0.tar.xz.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAEBCgAdFiEE0c8kRKeFjF8vsJW3Snd0e8I4blAFAmQOAmUACgkQSnd0e8I4
-blCklRAAgmEO5aUb8waQVBY3BToh/z3T3QyYefjx60yamuNUJp+V8HrMQHFhE20u
-p6LUn8ZZF9u9QM3+mnbitusoGj3bD7tbBlbAOFcfQU2/YADzbyCV6TY4vglxqWEl
-XkBp9ztsBOYJVtTzcGmS0Prc16RGd23Hi/fsiYsb95RIuAD/RbF+fDnE/JwUolDj
-NRhZI5/zOtwdOVvwM6d4ZmdWGEs93OU6fm4ne1Ip1pwmNR7aNqmz4LVdLTLaKBSQ
-smtYybU7NJdyd13ZqgYe9tBP/UmCjmoKVejp0+lqR9vUjakhR10eEb4zn74qt3NU
-WPMfUR4zcdyPS9urSFZqQUqELmJhl98oR6q3/P3+Yp1CeJyOFygjip+qoMCKf6gc
-AbIJMEMhxwcpXNpZ4RZz9KcPpwSX1zsP65nt48xEIrJ91LlTzkuDXquLMZS72BN3
-Q3Sfqn8rAlnK8hjDn+zYIiXGcc7QABC0BOXvF9Lq5ptticN7AKJ/05ptccS0xUCA
-5eHUH4URfpbX7gUJsVEGqvQbfFCqCkEaVzFLTcfjIO3arS6Zpw2RmgddvUKUYKOG
-zNXmQ2TE9c5g2lfa6jZg50YDeq1ewuuDhez9fyfTaauvTh6EoeLrlO9xSM9FBs09
-iiT6jq8jOlkBleuGsrdpTbBwl7vEidv9YINI6wgkLdUC6IHT2nE=
-=NI5L
------END PGP SIGNATURE-----

digiKam-8.0.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:102c712b6209fe2ac877c9b1d019dacadaf115adf915570d26816066d151e847
+size 35857384

digiKam-8.0.0.tar.xz.sig

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCgAdFiEE0c8kRKeFjF8vsJW3Snd0e8I4blAFAmQ3DvcACgkQSnd0e8I4
+blDYng/+PV90HbflMiTV1w/DDAyjTLIEP6KslaXlGCZ7NM8XzNLPUn4VC8zXdtGB
+JCJyijYpvFmT+Kd1Y0zpxKlLF05/110BgfZ6PzusI+oz0X3yckoHZ+f373Om/LGV
+UmMxAnV7nOlXIvrMjzqPkGe/rc3JNAU0relN4xp//X7TrMG/OSAdBW9zYAxhQ8Oq
+7pkKrAUZClUeit1e0iCXceEv8/e2i5NJG+Qo3SZZCgx1yTl/nbc/h8pKrLMv4+tQ
+/02UxBsNByPRHRSjxWWG8BRzHB5LN18iO2GWkzP/fOXxXEPrIuQ5yS2r+yNZUvkJ
+p2Dnm4HrwR3iIz5Qwf6Xk3AA1L8e4MRNKiW8odBw+xOB6NmY2uc0NHcXgipaREAg
+6wsV3r8JM17q4dqwyzZ7neXD7MLWnfo953nJHkxl8raBYTpq5UKQqNV/Hgjp38Dr
+MkkBpy43Hle44c8VzNxTDWxUUeOholzh4XADccM53GXKAT+lPAny/rnpDkYL1sql
+w1wQQOIUHqC2gLWtCSQCXWS5OXb/MfC4oQhl10hC1ajz9//FESFlbt0KsIG/xkzz
+0tfLNUt5CbKIysGIsZvKKWQtq4rR54PODIf0GLkGoDrYuOE1Iofai+AtMQc98avY
+S9nb6n6T0kcQmE1FzyaQxppe3mciYG26Vc0Z3T7ujBQJVIvZ9rM=
+=9CWb
+-----END PGP SIGNATURE-----

digikam.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Apr 17 08:18:04 UTC 2023 - Christophe Marin <christophe@krop.fr>
+
+- Update to 8.0.0:
+  https://www.digikam.org/news/2023-04-16-8.0.0_release_announcement/
+- Drop patch, merged upstream:
+  * 0001-fix-compile-DNG-SDK-with-GCC13.patch
+
 -------------------------------------------------------------------
 Tue Mar 28 08:43:33 UTC 2023 - Christophe Marin <christophe@krop.fr>
 

digikam.spec

@@ -16,11 +16,11 @@
 #
 
 
-%define soversion 7_10_0
+%define soversion 8_0_0
 %bcond_without released
 %bcond_with    apidocs
 Name:           digikam
-Version:        7.10.0
+Version:        8.0.0
 Release:        0
 Summary:        A KDE Photo Manager
 License:        GPL-2.0-or-later
@@ -30,8 +30,6 @@ Source0:        https://download.kde.org/stable/%{name}/%{version}/digiKam-%{ver
 Source1:        https://download.kde.org/stable/%{name}/%{version}/digiKam-%{version}.tar.xz.sig
 Source2:        %{name}.keyring
 %endif
-# PATCH-FIX-UPSTREAM
-Patch0:         0001-fix-compile-DNG-SDK-with-GCC13.patch
 # QtWebEngine is not available on ppc and zSystems
 ExclusiveArch:  %{arm} aarch64 %{ix86} x86_64 %{riscv}
 BuildRequires:  QtAV-devel >= 1.12
@@ -96,21 +94,12 @@ BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(zlib)
-%if 0%{suse_version} >= 1550
-BuildRequires:  ffmpeg-4-libavcodec-devel
-BuildRequires:  ffmpeg-4-libavdevice-devel
-BuildRequires:  ffmpeg-4-libavfilter-devel
-BuildRequires:  ffmpeg-4-libavformat-devel
-BuildRequires:  ffmpeg-4-libavutil-devel
-BuildRequires:  ffmpeg-4-libswscale-devel
-%else
 BuildRequires:  pkgconfig(libavcodec)
 BuildRequires:  pkgconfig(libavdevice)
 BuildRequires:  pkgconfig(libavfilter)
 BuildRequires:  pkgconfig(libavformat)
 BuildRequires:  pkgconfig(libavutil)
 BuildRequires:  pkgconfig(libswscale)
-%endif
 Requires:       %{name}-plugins
 Requires:       libQt5Sql5-sqlite
 Recommends:     marble
@@ -189,10 +178,8 @@ sed -i 's#KF5::AkonadiCore#KPim5::AkonadiCore#' core/utilities/extrasupport/addr
 %install
 %kf5_makeinstall -C build
 
-%if 0%{?suse_version}
 %suse_update_desktop_file -r org.kde.digikam Qt KDE Graphics Photography
 %suse_update_desktop_file -r org.kde.showfoto Qt KDE Graphics Photography
-%endif
 
 %find_lang %{name} --without-kde
 
@@ -201,22 +188,23 @@ sed -i 's#KF5::AkonadiCore#KPim5::AkonadiCore#' core/utilities/extrasupport/addr
 %ldconfig_scriptlets -n libdigikamcore%{soversion}
 
 %files
-%{_kf5_bindir}/digikam
+%doc AUTHORS NEWS README.md
-%{_kf5_bindir}/digitaglinktree
-%{_kf5_bindir}/cleanup_digikamdb
-%{_kf5_applicationsdir}/org.kde.digikam.desktop
-%{_kf5_iconsdir}/hicolor/*/actions/
-%{_kf5_iconsdir}/hicolor/*/apps/digikam.*
-%doc %{_kf5_mandir}/man1/cleanup_digikamdb.1%{ext_man}
-%doc %{_kf5_mandir}/man1/digitaglinktree.1%{ext_man}
-%{_kf5_sharedir}/digikam/
 %dir %{_kf5_sharedir}/solid
 %dir %{_kf5_sharedir}/solid/actions
-%{_kf5_sharedir}/solid/actions/digikam-opencamera.desktop
+%doc %{_kf5_mandir}/man1/cleanup_digikamdb.1%{ext_man}
+%doc %{_kf5_mandir}/man1/digitaglinktree.1%{ext_man}
+%{_kf5_applicationsdir}/org.kde.digikam.desktop
+%{_kf5_appstreamdir}/org.kde.digikam.appdata.xml
+%{_kf5_bindir}/cleanup_digikamdb
+%{_kf5_bindir}/digikam
+%{_kf5_bindir}/digitaglinktree
+%{_kf5_iconsdir}/hicolor/*/actions/
+%{_kf5_iconsdir}/hicolor/*/apps/avplayer.*
+%{_kf5_iconsdir}/hicolor/*/apps/digikam.*
 %{_kf5_kxmlguidir}/digikam/
 %{_kf5_notifydir}/digikam.notifyrc
-%{_kf5_appstreamdir}/org.kde.digikam.appdata.xml
+%{_kf5_sharedir}/digikam/
-%doc AUTHORS NEWS README.md
+%{_kf5_sharedir}/solid/actions/digikam-opencamera.desktop
 
 %files plugins
 %{_kf5_iconsdir}/hicolor/*/apps/dk-*
@@ -235,18 +223,18 @@ sed -i 's#KF5::AkonadiCore#KPim5::AkonadiCore#' core/utilities/extrasupport/addr
 %{_kf5_libdir}/libdigikamgui.so
 
 %files -n showfoto
-%{_kf5_bindir}/showfoto
 %{_kf5_applicationsdir}/org.kde.showfoto.desktop
-%{_kf5_iconsdir}/hicolor/*/apps/showfoto.*
-%{_kf5_sharedir}/showfoto/
-%{_kf5_kxmlguidir}/showfoto/
 %{_kf5_appstreamdir}/org.kde.showfoto.appdata.xml
+%{_kf5_bindir}/showfoto
+%{_kf5_iconsdir}/hicolor/*/apps/showfoto.*
+%{_kf5_kxmlguidir}/showfoto/
+%{_kf5_sharedir}/showfoto/
 
 %files -n libdigikamcore%{soversion}
-%license COPYING*
+%license LICENSES/*
-%{_kf5_libdir}/libdigikamcore.so.7.10.0
+%{_kf5_libdir}/libdigikamcore.so.8.0.0
-%{_kf5_libdir}/libdigikamdatabase.so.7.10.0
+%{_kf5_libdir}/libdigikamdatabase.so.8.0.0
-%{_kf5_libdir}/libdigikamgui.so.7.10.0
+%{_kf5_libdir}/libdigikamgui.so.8.0.0
 
 %files lang -f %{name}.lang