Architecture specific change in rpms/digikam.git

The package rpms/digikam.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/digikam.git/commit/?id=dd68443620abd....

Change:
+%ifarch %{?qt6_qtwebengine_arches}

Thanks.

Full change:
============

commit dd68443620abd5826538b1a9813273992b22d611
Author: nucleo 
Date:   Fri Dec 1 01:02:21 2023 +0200

Build with Qt6 for F40+ and qt6_qtwebengine_arches

diff --git a/digikam.spec b/digikam.spec
index c430532..be2d06f 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,3 +1,11 @@
+%bcond_with build_with_qt6
+%if 0%{?fedora} > 39
+%ifarch %{?qt6_qtwebengine_arches}
+%bcond_without build_with_qt6
+%global qwebengine 1
+%endif
+%endif
+
 # use ninja or not
 %global ninja 1

@@ -6,7 +14,7 @@
 Name:    digikam
 Summary: A digital camera accessing & photo management application
 Version: 8.2.0
-Release: 1%{?beta}%{?dist}
+Release: 2%{?beta}%{?dist}

License: GPL-2.0-or-later
 URL:     http://www.digikam.org/
@@ -42,8 +50,6 @@ BuildRequires: ImageMagick-devel
 BuildRequires: ImageMagick-c++-devel >= 6.7
 BuildRequires: libjpeg-devel
 BuildRequires: libtiff-devel
-BuildRequires: marble-astro-devel
-BuildRequires: marble-widget-qt5-devel
 BuildRequires: perl-generators
 BuildRequires: pkgconfig(exiv2) >= 0.26
 BuildRequires: pkgconfig(glib-2.0)
@@ -52,27 +58,57 @@ BuildRequires: pkgconfig(lcms2)
 BuildRequires: pkgconfig(libgphoto2_port) pkgconfig(libusb-1.0) pkgconfig(libusb)
 BuildRequires: pkgconfig(libpng) >= 1.2.7
 BuildRequires: pkgconfig(glu)
+BuildRequires: pkgconfig(x11) pkgconfig(xproto)
+%if %{with build_with_qt6}
+BuildRequires: pkgconfig(Qt6NetworkAuth)
+BuildRequires: pkgconfig(Qt6OpenGL)
+BuildRequires: pkgconfig(Qt6Svg)
+BuildRequires: pkgconfig(Qt6Multimedia)
+BuildRequires: pkgconfig(Qt6StateMachine)
+BuildRequires: pkgconfig(Qt6WebEngineWidgets)
+# missing Qt6 deps
+#BuildRequires: marble-astro-devel
+#BuildRequires: marble-widget-qt6-devel
+#BuildRequires: kf6-libksane-devel
+BuildRequires: kf6-kcalendarcore-devel
+BuildRequires: kf6-kconfig-devel
+BuildRequires: kf6-kdoctools-devel
+BuildRequires: kf6-kfilemetadata-devel
+BuildRequires: kf6-kwindowsystem-devel
+BuildRequires: kf6-kxmlgui-devel
+BuildRequires: kf6-ki18n-devel
+BuildRequires: kf6-kitemmodels-devel
+BuildRequires: kf6-kio-devel
+BuildRequires: kf6-kservice-devel
+BuildRequires: kf6-kiconthemes-devel
+BuildRequires: kf6-karchive-devel
+BuildRequires: kf6-threadweaver-devel
+BuildRequires: kf6-kcoreaddons-devel
+BuildRequires: kf6-knotifyconfig-devel
+BuildRequires: kf6-knotifications-devel
+BuildRequires: kf6-solid-devel
+BuildRequires: kf6-sonnet-devel
+BuildRequires: kf6-kitemviews-devel
+BuildRequires: kf6-kbookmarks-devel
+BuildRequires: kf6-rpm-macros
+BuildRequires: qt6-qtbase-private-devel
+%else
 BuildRequires: pkgconfig(Qt5NetworkAuth)
 BuildRequires: pkgconfig(Qt5OpenGL)
 BuildRequires: pkgconfig(Qt5Svg)
 BuildRequires: pkgconfig(Qt5XmlPatterns)
 BuildRequires: pkgconfig(Qt5X11Extras)
 BuildRequires: pkgconfig(Qt5WebKit)
-BuildRequires: pkgconfig(x11) pkgconfig(xproto)
 %if 0%{?qt5_qtwebengine_arches:1}
 %ifarch %{?qt5_qtwebengine_arches}
 %global qwebengine 1
-%if 0%{?fedora} >= 38
-BuildRequires: cmake(KF5Akonadi)
-BuildRequires: cmake(KF5Contacts)
-%else
-BuildRequires: cmake(KF5AkonadiContact)
-%endif
 BuildRequires: pkgconfig(Qt5WebEngine)
 %else
 BuildRequires: pkgconfig(Qt5WebKit)
 %endif
 %endif
+BuildRequires: marble-astro-devel
+BuildRequires: marble-widget-qt5-devel
 BuildRequires: kf5-libksane-devel >= 16.03
 BuildRequires: kf5-kcalendarcore-devel
 BuildRequires: kf5-kconfig-devel
@@ -95,6 +131,7 @@ BuildRequires: kf5-sonnet-devel
 BuildRequires: kf5-kitemviews-devel
 BuildRequires: kf5-kbookmarks-devel
 BuildRequires: kf5-rpm-macros
+%endif

## not actually checked-for or used -- rex
 ## rely on explicit cmake build options instead
@@ -135,8 +172,13 @@ Recommends: hugin-base
 #Recommends: kf5-kipi-plugins
 # thumbnailers, better default access to mtp-enabled devices
 Recommends: kio-extras
+%if %{with build_with_qt6}
+Recommends: qt6-qtbase-mysql%{?_isa}
+Recommends: qt6-qtimageformats%{?_isa}
+%else
 Recommends: qt5-qtbase-mysql%{?_isa}
 Recommends: qt5-qtimageformats%{?_isa}
+%endif

# core/libs/rawengine/libraw/
 Provides: bundled(LibRaw) = 0.21.1
@@ -176,9 +218,14 @@ needed to develop applications using %{name}.

%build
+%if %{with build_with_qt6}
+%cmake_kf6 \
+  -DBUILD_WITH_QT6:BOOL=ON \
+  -DENABLE_QTMULTIMEDIA:BOOL=ON \
+%else
 %cmake_kf5 \
+%endif
   %{?ninja:-G Ninja} \
-  -DENABLE_AKONADICONTACTSUPPORT:BOOL=ON \
   -DENABLE_APPSTYLES:BOOL=ON \
   -DENABLE_KFILEMETADATASUPPORT:BOOL=ON \
 %if 0%{?rhel} && 0%{?rhel} < 9
@@ -202,26 +249,68 @@ desktop-file-install --vendor="" \

%check
-for i in %{buildroot}%{_kf5_datadir}/applications/*.desktop ; do
+for i in %{buildroot}%{_datadir}/applications/*.desktop ; do
 desktop-file-validate $i ||:
 done

%if 0%{?rhel} && 0%{?rhel} < 8
 %post
-touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :

%postun
 if [ $1 -eq 0 ] ; then
-  touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null
-  gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
   update-desktop-database -q &> /dev/null
 fi

%posttrans
-gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null
 %endif

+
+%ldconfig_scriptlets libs
+
+
+%if %{with build_with_qt6}
+%files -f %{name}.lang
+%doc AUTHORS ChangeLog
+%doc NEWS README.md
+%license LICENSES/GPL-2.0-or-later.txt
+%{_kf6_bindir}/digikam
+%{_kf6_bindir}/digitaglinktree
+%{_kf6_bindir}/cleanup_digikamdb
+%{_kf6_bindir}/showfoto
+%{_kf6_datadir}/kxmlgui5/digikam/
+%{_kf6_datadir}/kxmlgui5/showfoto/
+%{_kf6_datadir}/knotifications6/digikam.notifyrc
+%{_kf6_datadir}/digikam/
+%{_kf6_datadir}/showfoto/
+%{_kf6_datadir}/solid/actions/digikam*.desktop
+%{_kf6_metainfodir}/org.kde.digikam.appdata.xml
+%{_kf6_metainfodir}/org.kde.showfoto.appdata.xml
+%{_kf6_datadir}/applications/digikam-import.desktop
+%{_kf6_datadir}/applications/org.kde.digikam.desktop
+%{_kf6_datadir}/applications/org.kde.showfoto.desktop
+%{_mandir}/man1/digitaglinktree.1*
+%{_mandir}/man1/cleanup_digikamdb.1*
+%{_kf6_datadir}/icons/hicolor/*/*/*
+
+%files libs
+%{_kf6_libdir}/libdigikamcore.so.*
+%{_kf6_libdir}/libdigikamdatabase.so.*
+%{_kf6_libdir}/libdigikamgui.so.*
+%{_kf6_qtplugindir}/digikam/
+
+%files devel
+%{_kf6_libdir}/libdigikamcore.so
+%{_kf6_libdir}/libdigikamdatabase.so
+%{_kf6_libdir}/libdigikamgui.so
+%{_kf6_libdir}/cmake/Digikam*/
+%{_includedir}/digikam/
+
+%else
 %files -f %{name}.lang
 %doc AUTHORS ChangeLog
 %doc NEWS README.md
@@ -245,8 +334,6 @@ update-desktop-database -q &> /dev/null
 %{_mandir}/man1/cleanup_digikamdb.1*
 %{_kf5_datadir}/icons/hicolor/*/*/*

-%ldconfig_scriptlets libs
-
 %files libs
 %{_kf5_libdir}/libdigikamcore.so.*
 %{_kf5_libdir}/libdigikamdatabase.so.*
@@ -259,9 +346,13 @@ update-desktop-database -q &> /dev/null
 %{_kf5_libdir}/libdigikamgui.so
 %{_kf5_libdir}/cmake/Digikam*/
 %{_includedir}/digikam/
+%endif

%changelog
+* Thu Nov 30 2023 Alexey Kurov  - 8.2.0-2
+- Build with Qt6 for F40+ and qt6_qtwebengine_arches
+
 * Thu Nov 30 2023 Alexey Kurov  - 8.2.0-1
 - digiKam-8.2.0

commit 263a117ac76a5991bc6d915f618165bf8e42b804
Author: nucleo 
Date:   Thu Nov 30 21:06:45 2023 +0200

digiKam-8.2.0

diff --git a/.gitignore b/.gitignore
index 5782806..ecf4353 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /digiKam-7.10.0.tar.xz
 /digiKam-8.0.0.tar.xz
 /digiKam-8.1.0.tar.xz
+/digiKam-8.2.0.tar.xz
diff --git a/digikam.spec b/digikam.spec
index e503e74..c430532 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -5,8 +5,8 @@

Name:    digikam
 Summary: A digital camera accessing & photo management application
-Version: 8.1.0
-Release: 4%{?beta}%{?dist}
+Version: 8.2.0
+Release: 1%{?beta}%{?dist}

License: GPL-2.0-or-later
 URL:     http://www.digikam.org/
@@ -119,7 +119,6 @@ BuildRequires: pkgconfig(libavfilter)
 BuildRequires: pkgconfig(libavformat)
 BuildRequires: pkgconfig(libswscale)
 BuildRequires: pkgconfig(libass)
-BuildRequires: pkgconfig(openal)
 BuildRequires: pkgconfig(libpulse)
 BuildRequires: pkgconfig(libva)
 BuildRequires: pkgconfig(xext)
@@ -263,6 +262,9 @@ update-desktop-database -q &> /dev/null

%changelog
+* Thu Nov 30 2023 Alexey Kurov  - 8.2.0-1
+- digiKam-8.2.0
+
 * Tue Nov 28 2023 Orion Poplawski  - 8.1.0-4
 - Rebuild for jasper 4.1

diff --git a/sources b/sources
index 3e2307a..d4a8184 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (digiKam-8.1.0.tar.xz) = cbf5a776b4138f4f05d074721324b046dfa07ddc01259f569ae46c46a6d5b0b00824ef0962a09041081703348e4defecf15cff800b2c6cf5e04a0e7e963a3ef4
+SHA512 (digiKam-8.2.0.tar.xz) = a34c5bde0e579b5f6de1fe90977e01bc385e5c28155d24db09e3cdfe7958c979d2e27cbce402d6c5b70f952fc0ead88318dfa025bb67e540c4d763cb139db7bb

commit e899b13a34751e3f8cec991c59f4b93abb38a5df
Author: Orion Poplawski 
Date:   Mon Nov 27 19:23:50 2023 -0700

Fix up KF5Akonadi/Contacs BR

diff --git a/digikam.spec b/digikam.spec
index ed34651..e503e74 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -62,7 +62,12 @@ BuildRequires: pkgconfig(x11) pkgconfig(xproto)
 %if 0%{?qt5_qtwebengine_arches:1}
 %ifarch %{?qt5_qtwebengine_arches}
 %global qwebengine 1
+%if 0%{?fedora} >= 38
+BuildRequires: cmake(KF5Akonadi)
+BuildRequires: cmake(KF5Contacts)
+%else
 BuildRequires: cmake(KF5AkonadiContact)
+%endif
 BuildRequires: pkgconfig(Qt5WebEngine)
 %else
 BuildRequires: pkgconfig(Qt5WebKit)

commit b587a7fae339dc7084e6cc26caa11728b7a5ccb9
Author: Orion Poplawski 
Date:   Mon Nov 27 18:57:28 2023 -0700

Rebuild for jasper 4.1

diff --git a/digikam.spec b/digikam.spec
index 1e5454d..ed34651 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -6,7 +6,7 @@
 Name:    digikam
 Summary: A digital camera accessing & photo management application
 Version: 8.1.0
-Release: 3%{?beta}%{?dist}
+Release: 4%{?beta}%{?dist}

License: GPL-2.0-or-later
 URL:     http://www.digikam.org/
@@ -258,6 +258,9 @@ update-desktop-database -q &> /dev/null

%changelog
+* Tue Nov 28 2023 Orion Poplawski  - 8.1.0-4
+- Rebuild for jasper 4.1
+
 * Mon Aug 07 2023 Sérgio Basto  - 8.1.0-3
 - Rebuild for opencv 4.8.0