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

RPM tdelibs: update packaging for TDE master

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

Original commits represented: 6.

Signed-off-by: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>
---
 redhat/core/tdelibs/tdelibs.spec | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/redhat/core/tdelibs/tdelibs.spec b/redhat/core/tdelibs/tdelibs.spec
index f156b1c6b..1108e34af 100644
--- a/redhat/core/tdelibs/tdelibs.spec
+++ b/redhat/core/tdelibs/tdelibs.spec
@@ -73,19 +73,13 @@ PreReq: permissions
 %endif
 
 # Trinity dependencies
-BuildRequires:	libtqt4-devel = %{tde_epoch}:4.2.0
+BuildRequires:	libtqt3-mt-devel >= 3.5.0
+BuildRequires:	tqt3-dev-tools >= 3.5.0
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	libdbus-tqt-1-devel >= %{tde_epoch}:0.63
 BuildRequires:	libdbus-1-tqt-devel >= %{tde_epoch}:0.9
-BuildRequires:	trinity-filesystem >= %{tde_version}
 
 Requires:		trinity-arts >= %{tde_epoch}:1.5.10
-Requires:		trinity-filesystem >= %{tde_version}
-%if 0%{?mgaversion} >= 6
-%else
-Requires:		fileshareset >= 2.0
-%endif
-
 BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
@@ -136,11 +130,15 @@ BuildRequires:	libtiff-devel
 %endif
 
 # OPENSSL support
+%if 0%{?suse_version}
+BuildRequires:	libopenssl-3-devel
+%else
 %if 0%{?mdkver}
 BuildRequires:	%{_lib}openssl-devel
 %else
 BuildRequires:	openssl-devel
 %endif
+%endif
 
 # ACL support
 %if 0%{?mgaversion} || 0%{?mdkversion}
@@ -152,6 +150,11 @@ BuildRequires:	libacl-devel
 # GLIB2 support
 BuildRequires:	glib2-devel
 
+%if 0%{?suse_version}
+BuildRequires:	lzlib-devel
+BuildRequires:	libwebp-devel
+%endif
+
 # LUA support are not ready yet
 #BuildRequires:	lua-devel
 
@@ -174,6 +177,8 @@ BuildRequires:	gamin-devel
 %define with_pcre 1
 %if 0%{?mgaversion} >= 9
 BuildRequires:	%{_lib}pcre-devel
+%elif 0%{?suse_version}
+BuildRequires:	pcre2-devel
 %else
 BuildRequires:	pcre-devel
 %endif
@@ -202,7 +207,7 @@ BuildRequires:	libutempter-devel
 BuildRequires:	utempter
 %endif
 %if 0%{?suse_version}
-BuildRequires:	utempter-devel
+# Tumbleweed no longer provides utempter; the source supports disabling it.
 %endif
 
 # HSPELL support
@@ -329,7 +334,7 @@ Requires:		openssl
 BuildRequires:	ca-certificates
 Requires:		ca-certificates
 %endif
-%if "%{cacert}" != ""
+%if "%{cacert}" != "" && !0%{?suse_version}
 Requires:		%{cacert}
 %endif
 
@@ -646,7 +651,6 @@ Obsoletes:	trinity-kdelibs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:	trinity-kdelibs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
 Requires:	libtqt3-mt-devel >= 3.5.0
-Requires:	libtqt4-devel = %{tde_epoch}:4.2.0
 Requires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 Requires:	libart_lgpl-devel
 Requires:	%{libattr_devel}
@@ -739,10 +743,18 @@ fi
   -DWITH_TIFF=ON \
   %{?!with_jasper:-DWITH_JASPER=OFF} \
   %{?!with_openexr:-DWITH_OPENEXR=OFF} \
+  %if 0%{?suse_version}
+  -DWITH_UTEMPTER=OFF \
+  %else
   -DWITH_UTEMPTER=ON \
+  %endif
   %{?!with_avahi:-DWITH_AVAHI=OFF} \
   %{?!with_elficon:-DWITH_ELFICON=OFF} \
+  %if 0%{?suse_version}
+  -DWITH_PCRE2=ON \
+  %else
   %{?!with_pcre:-DWITH_PCRE=OFF} \
+  %endif
   %{?!with_inotify:-DWITH_INOTIFY=OFF} \
   %{?!with_gamin:-DWITH_GAMIN=OFF} \
   %{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \
@@ -790,7 +802,7 @@ fi
 
 # Fix 'tderesources.desktop' (openSUSE only)
 %if 0%{?suse_version}
-%suse_update_desktop_file -r tderesources Qt X-TDE-settings-desktop
+%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tderesources.desktop Qt X-TDE-settings-desktop
 %endif
 
 # Remove setuid bit on some binaries.
-- 
cgit v1.2.3