From 69e42ae6dee8ad4842f8b7c2bc10fefd21b5d561 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Mar 04 2024 17:06:36 +0000
Subject: 24.2.1.2, enable kf6


---

diff --git a/.gitignore b/.gitignore
index 7bf77a9..94d6acc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,9 @@
 /libreoffice-help-24.2.1.1.tar.xz.asc
 /libreoffice-translations-24.2.1.1.tar.xz
 /libreoffice-translations-24.2.1.1.tar.xz.asc
+/libreoffice-24.2.1.2.tar.xz
+/libreoffice-24.2.1.2.tar.xz.asc
+/libreoffice-help-24.2.1.2.tar.xz
+/libreoffice-help-24.2.1.2.tar.xz.asc
+/libreoffice-translations-24.2.1.2.tar.xz
+/libreoffice-translations-24.2.1.2.tar.xz.asc
diff --git a/libreoffice.spec b/libreoffice.spec
index 2eebe45..9552ae5 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -57,7 +57,7 @@ ExcludeArch:    %{ix86}
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
-Version:        %{libo_version}.1
+Version:        %{libo_version}.2
 %if 0%{?libo_prerelease}
 Release:        %autorelease -e %{?libo_prerelease}
 %else
@@ -227,6 +227,13 @@ BuildRequires: kf5-kdelibs4support-devel
 BuildRequires: kf5-ki18n-devel
 BuildRequires: kf5-kio-devel
 BuildRequires: kf5-kwindowsystem-devel
+
+BuildRequires: qt6-qtbase-devel
+BuildRequires: kf6-kconfig-devel
+BuildRequires: kf6-kcoreaddons-devel
+BuildRequires: kf6-ki18n-devel
+BuildRequires: kf6-kio-devel
+BuildRequires: kf6-kwindowsystem-devel
 %endif
 
 BuildRequires: gpgmepp-devel
@@ -678,6 +685,21 @@ Supplements: (%{name}-core%{?_isa} and plasma-workspace)
 %description kf5
 A plug-in for LibreOffice that enables integration into the KDE Frameworks 5.
 
+%package kf6
+Summary: LibreOffice KDE Frameworks 6 integration plug-in
+Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release}
+Provides: %{name}-plugin = %{epoch}:%{version}-%{release}
+Provides: %{name}-plugin%{?_isa} = %{epoch}:%{version}-%{release}
+Obsoletes: libreoffice-kde4 < 1:6.3.0.0
+Obsoletes: libreoffice-kde5 < 1:6.4.7.3
+Obsoletes: libreoffice-kde4-debuginfo < 1:6.3.0.0
+Obsoletes: libreoffice-kde5-debuginfo < 1:6.4.7.3
+Supplements: (%{name}-core%{?_isa} and plasma-workspace)
+
+%description kf6
+A plug-in for LibreOffice that enables integration into the KDE Frameworks 6.
+
 %endif
 
 %package -n libreofficekit
@@ -1085,14 +1107,14 @@ done
 ARCH_FLAGS="$ARCH_FLAGS -g1"
 %endif
 export ARCH_FLAGS
-export CFLAGS="$ARCH_FLAGS -I%{_includedir}/zxcvbn"
-export CXXFLAGS="$ARCH_FLAGS -I%{_includedir}/zxcvbn"
+export CFLAGS="$ARCH_FLAGS -I%{_includedir}/zxcvbn -I%{_includedir}/KF6/KConfig/"
+export CXXFLAGS="$ARCH_FLAGS -I%{_includedir}/zxcvbn -I%{_includedir}/KF6/KConfig/"
 
 %if 0%{?rhel}
 %define distrooptions --disable-eot --disable-firebird-sdbc
 %else
 # fedora
-%define distrooptions --enable-eot --enable-kf5
+%define distrooptions --enable-eot --enable-kf5 --enable-kf6
 %endif
 
 %ifarch %{java_arches}
@@ -2262,6 +2284,10 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
 %{baseinstdir}/program/libvclplug_kf5lo.so
 %{baseinstdir}/program/libvclplug_qt5lo.so
 
+%files kf6
+%{baseinstdir}/program/libvclplug_kf6lo.so
+%{baseinstdir}/program/libvclplug_qt6lo.so
+
 %endif
 
 %files -n libreofficekit
diff --git a/sources b/sources
index 14984e2..dfd6517 100644
--- a/sources
+++ b/sources
@@ -1,9 +1,9 @@
-SHA512 (libreoffice-24.2.1.1.tar.xz) = 33ff4852274bf6f6c37a2bfdddc925afdaf893352b830154e679b7ed919f697713a0beaf45315c61084b0f2b5c8e16635f9065de610d425581f640425de3fe67
-SHA512 (libreoffice-24.2.1.1.tar.xz.asc) = 8f66f3ddf3edd0ed7283cb66960b597c6408c02c8d866b270aa11b6345d4f80d758e9b19f86116958b3705c7618065e5d7a1268214bc43962f63527ebeca3072
-SHA512 (libreoffice-help-24.2.1.1.tar.xz) = e9f09a2d6adbdd01bae9bf05d9a0f573878cf37e10468eaf0c1cbcd05e109d6bec3c496bdcb58030bd5f8d1472342334f983c63ecc3756ff2c9a0e231b86fdb9
-SHA512 (libreoffice-help-24.2.1.1.tar.xz.asc) = 3ee85c6da6c35ca8e9a378ba9ed16f499f99af0bef873ead9e620abed8f87fbc43ec12b7441cf08e14f0c340186a9622cbda644dd3e2cd605d50a4267b82c52e
-SHA512 (libreoffice-translations-24.2.1.1.tar.xz) = c288ae66efe060eee8d3c85d264387b86df85463fb20b0856e0ed87bfe414d8241411ded928f76d5606df8f896a7590ab6796cd919a9927c0ea450f92601c985
-SHA512 (libreoffice-translations-24.2.1.1.tar.xz.asc) = c0f3af4dc6c36f703907fffddf9354fdf37bb3c02ccabccf9575ab4d2079633ab11e8c04f597992ab9ad05ac7603ae0f6c4715d4987feb27393a2f1f1b0bcb60
+SHA512 (libreoffice-24.2.1.2.tar.xz) = 650a61a56759109a17e65bcd31b9876b19ac7c71996854566ea8f6e8039276bd29173c80b3a2d4466cd2c6fcb63d4b95f3d4c78bd7ad22bdd190b801b5665a56
+SHA512 (libreoffice-24.2.1.2.tar.xz.asc) = 7005a1872cad7790e872cd6f9fae4cf19237870c97437f0bd0e31e94d66bc2b45df2963074282e0a909d9f1176ed2c6582dd1a91c95ab46d414fcadbcf98f086
+SHA512 (libreoffice-help-24.2.1.2.tar.xz) = bac54ac89f4c97434c354f3f281602fd8720546f549a687940bd028bedbd2841241429ee11983f805322136a8376453bcbbc6c87b8d032c025a50da95b1ce851
+SHA512 (libreoffice-help-24.2.1.2.tar.xz.asc) = 5e423577224fa6416e92167d0c8d4a3b50a5c7df010c8b37c5efe904cac16fab5adceded3b3bc2557a048bb964b5371cd104b83bc0a871ba5e6bc2a597f06dd5
+SHA512 (libreoffice-translations-24.2.1.2.tar.xz) = 70593e2ae7376d19a7a4bfe270755562afe03d96489453739d030805cd4b76a5906853132a89b47b93f2c509fab42162b066b3189f5e791e76eee0c574d0adcd
+SHA512 (libreoffice-translations-24.2.1.2.tar.xz.asc) = 60ea09c6043754f694982bef1e0f4863659d27fd536a488d17634fabf287181e6817eb9bdf8ee2d463a0cee3888f76757fce6dfe5643929f42a3ccfed55c1bd2
 SHA512 (17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a