From 17d2c24c0b635964c6664dc4ac1ed65379069521 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Tue, 22 Sep 2026 06:25:09 -0300 Subject: RPM tdeutils: update packaging for TDE master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RPM tdeutils: update packaging for TDE master Consolidate the final validated packaging changes for tdeutils from the Tumbleweed build series. Original commits represented: 4. Signed-off-by: Sebastião Guerra --- redhat/core/tdeutils/tdeutils.spec | 58 +++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 23 deletions(-) diff --git a/redhat/core/tdeutils/tdeutils.spec b/redhat/core/tdeutils/tdeutils.spec index cd0c99dd7..0d8db1b13 100644 --- a/redhat/core/tdeutils/tdeutils.spec +++ b/redhat/core/tdeutils/tdeutils.spec @@ -71,9 +71,12 @@ Provides: trinity-kdeutils-extras = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: tdeutils < %{?epoch:%{epoch}:}%{version}-%{release} Provides: tdeutils = %{?epoch:%{epoch}:}%{version}-%{release} -BuildRequires: trinity-filesystem >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} +%if 0%{?suse_version} +BuildRequires: libtqt3-mt-devel >= 3.5.0 +BuildRequires: tqt3-dev-tools >= 3.5.0 +%endif BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ @@ -127,7 +130,11 @@ BuildRequires: gamin-devel %endif # PCRE support +%if 0%{?suse_version} +BuildRequires: pcre2-devel +%else BuildRequires: pcre-devel +%endif # XMMS support #if 0#{?fedora} @@ -153,8 +160,12 @@ BuildRequires: libacl-devel %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?suse_version} +BuildRequires: libXss-devel +%else BuildRequires: libXScrnSaver-devel %endif +%endif %if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} >= 4 BuildRequires: %{_lib}xscrnsaver-devel @@ -167,6 +178,8 @@ BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel # OPENSSL support %if 0%{?mdkver} BuildRequires: %{_lib}openssl-devel +%elif 0%{?suse_version} +BuildRequires: libopenssl-3-devel %else BuildRequires: openssl-devel %endif @@ -334,7 +347,6 @@ This package contains kcharselect, a character set selector for TDE. %package -n trinity-tdelirc Summary: Infrared control for Trinity Group: Applications/Utilities -Requires: trinity-filesystem Obsoletes: trinity-kdelirc < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-kdelirc = %{?epoch:%{epoch}:}%{version}-%{release} @@ -1001,30 +1013,30 @@ fi # Updates applications categories for openSUSE %if 0%{?suse_version} -%suse_update_desktop_file KEdit Utility TextEditor +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/KEdit.desktop Utility TextEditor %if 0%{?build_superkaramba} -%suse_update_desktop_file superkaramba Utility DesktopUtility +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/superkaramba.desktop Utility DesktopUtility %endif -%suse_update_desktop_file KCharSelect Utility Accessibility -%suse_update_desktop_file khexedit Utility Editor -%suse_update_desktop_file Kjots Utility TimeUtility -%suse_update_desktop_file ktimer Utility TimeUtility -%suse_update_desktop_file kwikdisk System Applet -%suse_update_desktop_file kdf System Filesystem -%suse_update_desktop_file ark System Archiving -%suse_update_desktop_file kcalc Utility Calculator -%suse_update_desktop_file kgpg Utility Security -%suse_update_desktop_file irkick Applet -%suse_update_desktop_file tdewalletmanager Applet -%suse_update_desktop_file kregexpeditor Utility Editor -%suse_update_desktop_file kcmdf -%suse_update_desktop_file kcmlirc -%suse_update_desktop_file tdewalletconfig -%suse_update_desktop_file thinkpad -%suse_update_desktop_file kvaio -%suse_update_desktop_file KFloppy System Filesystem +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/KCharSelect.desktop Utility Accessibility +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/khexedit.desktop Utility Editor +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Kjots.desktop Utility TimeUtility +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/ktimer.desktop Utility TimeUtility +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kwikdisk.desktop System Applet +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kdf.desktop System Filesystem +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/ark.desktop System Archiving +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kcalc.desktop Utility Calculator +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kgpg.desktop Utility Security +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/irkick.desktop Applet +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/tdewalletmanager.desktop Applet +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kregexpeditor.desktop Utility Editor +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kcmdf.desktop +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kcmlirc.desktop +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/tdewalletconfig.desktop +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/thinkpad.desktop +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kvaio.desktop +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/KFloppy.desktop System Filesystem %if 0%{?build_tdefilereplace} -%suse_update_desktop_file -r tdefilereplace System FileManager +%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/tdefilereplace.desktop System FileManager %endif %endif -- cgit v1.2.3