From 2b543810e75e8678e47e744f13feb7aa084caac7 Mon Sep 17 00:00:00 2001
From: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>
Date: Tue, 22 Sep 2026 06:27:42 -0300
Subject: RPM koffice: update packaging for TDE master
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

RPM koffice: update packaging for TDE master

Consolidate the final validated packaging changes for koffice from the Tumbleweed build series.

Original commits represented: 8.

Signed-off-by: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>
---
 redhat/applications/office/koffice/koffice.spec | 53 ++++---------------------
 1 file changed, 8 insertions(+), 45 deletions(-)

diff --git a/redhat/applications/office/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec
index 39e1ddcdb..87af21b10 100644
--- a/redhat/applications/office/koffice/koffice.spec
+++ b/redhat/applications/office/koffice/koffice.spec
@@ -96,8 +96,11 @@ BuildRequires:	brp-check-trinity
 
 BuildRequires:	fontconfig-devel
 BuildRequires:	libart_lgpl-devel
+%if 0%{?suse_version}
+BuildRequires:	zlib-ng-compat-devel
+%else
 BuildRequires:	zlib-devel
-BuildRequires:	pcre-devel
+%endif
 BuildRequires:	gettext-devel
 BuildRequires:	mysql-devel
 BuildRequires:	perl
@@ -169,18 +172,6 @@ BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 %endif
 
-# LCMS support
-%if 0%{?suse_version} || 0%{?rhel} >= 7
-BuildRequires: liblcms-devel
-%else
-BuildRequires: lcms-devel
-%endif
-
-# LCMS2 support
-%if 0%{?suse_version}
-BuildRequires:	liblcms2-devel
-%endif
-
 # BZIP2 support
 %if 0%{?suse_version}
 BuildRequires:	libbz2-devel
@@ -232,20 +223,6 @@ BuildRequires:	GraphicsMagick-devel >= 1.1.0
 %endif
 %endif
 
-# UTEMPTER support
-%if 0%{?suse_version}
-BuildRequires:	utempter-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	utempter
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}utempter-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 5
-BuildRequires:	libutempter-devel
-%endif
-
 # POPPLER support
 %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
 %if 0%{?suse_version} >= 1500
@@ -291,16 +268,6 @@ BuildRequires:	libwpd-devel
 %endif
 Obsoletes:		trinity-libwpd < %{?epoch:%{epoch}:}%{version}-%{release}
 
-# WV2 support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mdkver} < 24090000
-BuildRequires:	%{_lib}wv2-devel
-%endif
-%endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	wv2-devel
-%endif
-
 # MESA support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %if 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0
@@ -366,7 +333,6 @@ Requires:		%{name}-kchart = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		%{name}-kformula = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		%{name}-filters = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		%{name}-kplato = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		%{name}-chalk = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description suite
 KOffice is an integrated office suite.
@@ -883,7 +849,6 @@ Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 %{tde_tdelibdir}/libwmlimport.*
 %{tde_tdelibdir}/libwpexport.*
 %{tde_tdelibdir}/libwpimport.*
-%{tde_tdelibdir}/libmswordimport.*
 %{tde_tdelibdir}/libxsltimport.*
 %{tde_tdelibdir}/libxsltexport.*
 %{tde_tdelibdir}/libhancomwordimport.*
@@ -919,6 +884,7 @@ Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 
 ##########
 
+%if 0
 %package chalk
 Summary:		pixel-based image manipulation program for the TDE Office Suite [Trinity]
 Group:			Applications/Productivity
@@ -1102,6 +1068,8 @@ This package is part of the TDE Office Suite.
 
 ##########
 
+%endif
+
 %package chalk-data
 Summary:		data files for Chalk painting program [Trinity]
 Group:			Applications/Productivity
@@ -1116,13 +1084,8 @@ This package is part of the TDE Office Suite.
 
 %files chalk-data
 %defattr(-,root,root,-)
-%{tde_tdeappdir}/chalk.desktop
-%{tde_datadir}/applnk/.hidden/chalk_*.desktop
 %{tde_datadir}/apps/chalk/
-%{tde_datadir}/apps/chalkplugins/
 %lang(en) %{tde_tdedocdir}/HTML/en/chalk/
-%{tde_datadir}/services/chalk*.desktop
-%{tde_datadir}/servicetypes/chalk*.desktop
 
 ##########
 
@@ -1156,7 +1119,7 @@ CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux"
 %endif
 
 %if 0%{?suse_version} >= 1550
-CXXFLAGS="${CXXFLAGS} -std=c++11"
+CXXFLAGS="${CXXFLAGS} -std=c++17"
 %endif
 
 # FTBFS on RHEL 5
-- 
cgit v1.2.3