From d439f5ed861e78e6c4ce588a6412ba764c0f165c Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Tue, 22 Sep 2026 06:25:08 -0300 Subject: RPM tdebase: update packaging for TDE master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RPM tdebase: update packaging for TDE master Consolidate the final validated packaging changes for tdebase from the Tumbleweed build series. Original commits represented: 4. Signed-off-by: Sebastião Guerra --- redhat/core/tdebase/tdebase.spec | 55 ++++++++++++++++++++++++--- redhat/core/tdebase/trinity-tdebase-rpmlintrc | 1 + 2 files changed, 51 insertions(+), 5 deletions(-) diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec index 62c3c6b45..4e5dc028b 100644 --- a/redhat/core/tdebase/tdebase.spec +++ b/redhat/core/tdebase/tdebase.spec @@ -221,6 +221,9 @@ Requires: hicolor-icon-theme-branding BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} +%if 0%{?suse_version} +BuildRequires: tqt3-dev-tools >= 3.5.0 +%endif BuildRequires: trinity-tde-cmake >= %{tde_version} BuildRequires: gcc-c++ @@ -228,7 +231,11 @@ BuildRequires: make BuildRequires: fdupes # HTDIG support +%if 0%{?suse_version} +# Tumbleweed no longer provides htdig; the source supports disabling its search handlers. +%else BuildRequires: htdig +%endif # OPENSSL support %if 0%{?mdkver} @@ -266,7 +273,11 @@ BuildRequires: %{libvorbis_devel} BuildRequires: glib2-devel # PCRE support +%if 0%{?suse_version} +BuildRequires: pcre2-devel +%else BuildRequires: pcre-devel +%endif # SASL support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} @@ -280,6 +291,11 @@ BuildRequires: %{_lib}sasl2-devel BuildRequires: cyrus-sasl-devel %endif +# Alternatives support +%if 0%{?suse_version} >= 1500 +BuildRequires: update-alternatives +%endif + # PAM support BuildRequires: pam-devel @@ -1159,6 +1175,7 @@ plugdev group. %{tde_tdeappdir}/spellchecking.desktop %{tde_tdeappdir}/style.desktop %{tde_tdeappdir}/tde-kcontrol.desktop +%{tde_tdeappdir}/touchpad.desktop %{tde_tdeappdir}/useragent.desktop %{tde_tdeappdir}/xserver.desktop %{tde_datadir}/applnk/.hidden/energy.desktop @@ -1301,6 +1318,7 @@ TDE applications, particularly those in the TDE base module. %{tde_bindir}/kdialog %{tde_bindir}/khotkeys %{tde_bindir}/knetattach +%{tde_bindir}/tdesyndaemon %{tde_bindir}/krandom.kss %{tde_bindir}/ksystraycmd %{tde_bindir}/kxkb @@ -1314,8 +1332,6 @@ TDE applications, particularly those in the TDE base module. %{tde_tdelibdir}/kcminit_startup.so %{tde_tdelibdir}/kcm_keyboard.la %{tde_tdelibdir}/kcm_keyboard.so -%{tde_tdelibdir}/kcm_khotkeys_init.la -%{tde_tdelibdir}/kcm_khotkeys_init.so %{tde_tdelibdir}/kcm_khotkeys.la %{tde_tdelibdir}/kcm_khotkeys.so %{tde_tdelibdir}/kded_khotkeys.la @@ -1353,6 +1369,7 @@ TDE applications, particularly those in the TDE base module. %{tde_datadir}/apps/khotkeys/ %{tde_datadir}/autostart/tde_license_info.desktop %{tde_datadir}/services/kxkb.desktop +%{tde_datadir}/services/kded/khotkeys.desktop %if 0%{?suse_version} == 0 %config(noreplace) %{_sysconfdir}/pam.d/kcheckpass-trinity %config(noreplace) %{_sysconfdir}/pam.d/tdescreensaver-trinity @@ -1378,6 +1395,7 @@ TDE applications, particularly those in the TDE base module. %{tde_mandir}/man1/kxkb.1* %{tde_mandir}/man1/tdedebugdialog.1* %{tde_mandir}/man1/tdesu.1* +%exclude %{_usr}/lib/debug/opt/trinity/bin/tdesyndaemon.debug # SETUID binaries # Some setuid binaries need special care @@ -1469,7 +1487,11 @@ needed for a basic TDE desktop installation. %{tde_datadir}/apps/tdeconf_update/kcmdisplayrc.upd %{tde_datadir}/apps/tdeconf_update/kuriikwsfilter.upd %{tde_datadir}/apps/tdeconf_update/mouse_cursor_theme.upd +%{tde_datadir}/apps/tdeconf_update/remote_folder_icon.upd +%{tde_datadir}/apps/tdeconf_update/remote_folder_icon_upd.sh %{tde_datadir}/apps/tdeconf_update/socks.upd +%{tde_datadir}/apps/tdeconf_update/taskbar_wheel_action.sh +%{tde_datadir}/apps/tdeconf_update/taskbar_wheel_action.upd %{tde_datadir}/apps/kcontrol/ %{tde_datadir}/apps/tdedisplay/ %{tde_datadir}/apps/tdefontview/ @@ -1599,6 +1621,8 @@ needed for a basic TDE desktop installation. %{tde_datadir}/icons/crystalsvg/scalable/apps/xpaint.svgz %{tde_datadir}/icons/crystalsvg/*/devices/laptop.png %{tde_datadir}/icons/crystalsvg/*/devices/laptop.svgz +%{tde_datadir}/icons/crystalsvg/*/devices/input-touchpad.png +%{tde_datadir}/icons/crystalsvg/scalable/devices/input-touchpad.svg %{tde_datadir}/icons/crystalsvg/*/actions/newfont.png %{tde_datadir}/icons/crystalsvg/*/apps/abiword.png %{tde_datadir}/icons/crystalsvg/*/apps/agent.png @@ -1870,6 +1894,7 @@ group. %{tde_datadir}/services/tdefile_media.desktop %{tde_datadir}/services/tdefile_trash_system.desktop %{tde_datadir}/services/lzma.protocol +%{tde_datadir}/services/lzip.protocol %{tde_datadir}/services/kmanpart.desktop %{tde_datadir}/services/mac.protocol %{tde_datadir}/services/man.protocol @@ -1894,7 +1919,6 @@ group. %{tde_tdedocdir}/HTML/en/tdeioslave/ %{tde_mandir}/man1/ktrash.1* %{tde_mandir}/man1/tdeio_media_mounthelper.1* -%{tde_mandir}/man1/tdeio_system_documenthelper.1* %if 0%{?with_exr} %{tde_tdelibdir}/exrthumbnail.la @@ -2092,6 +2116,10 @@ Requires: %{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} Requires: pam Requires: logrotate +%if 0%{?suse_version} >= 1500 +Requires(post): update-alternatives +Requires(postun): update-alternatives +%endif # Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession) %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 4 @@ -2332,7 +2360,9 @@ workstations. Summary: Help center for TDE Group: System/GUI/Other Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} +%if ! 0%{?suse_version} Requires: htdig +%endif %description -n trinity-khelpcenter The TDE Help Center provides documentation on how to use the TDE desktop. @@ -2342,11 +2372,15 @@ documentation. %files -n trinity-khelpcenter %defattr(-,root,root,-) +%if ! 0%{?suse_version} %{tde_bindir}/khc_docbookdig.pl %{tde_bindir}/khc_htdig.pl %{tde_bindir}/khc_htsearch.pl +%endif %{tde_bindir}/khc_indexbuilder +%if ! 0%{?suse_version} %{tde_bindir}/khc_mansearch.pl +%endif %{tde_bindir}/khelpcenter %{tde_tdelibdir}/khelpcenter.la %{tde_tdelibdir}/khelpcenter.so @@ -2579,6 +2613,10 @@ Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kfind = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release} +%if 0%{?suse_version} >= 1500 +Requires(post): update-alternatives +Requires(preun): update-alternatives +%endif %description -n trinity-konqueror Konqueror is the file manager for the Trinity Desktop Environment. @@ -2869,6 +2907,10 @@ Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-twin = %{?epoch:%{epoch}:}%{version}-%{release} Requires: xmessage Requires: xprop +%if 0%{?suse_version} >= 1500 +Requires(post): update-alternatives +Requires(postun): update-alternatives +%endif %description -n trinity-ksmserver This package contains the TDE session manager. It is responsible for @@ -3083,8 +3125,6 @@ This package contains the default X window manager for TDE. %{tde_datadir}/applnk/.hidden/twinfocus.desktop %{tde_datadir}/applnk/.hidden/twinmoving.desktop %{tde_datadir}/applnk/.hidden/twintranslucency.desktop -%{tde_datadir}/apps/tdeconf_update/twin3_plugin.pl -%{tde_datadir}/apps/tdeconf_update/twin3_plugin.upd %{tde_datadir}/apps/tdeconf_update/twin_focus1.sh %{tde_datadir}/apps/tdeconf_update/twin_focus1.upd %{tde_datadir}/apps/tdeconf_update/twin_focus2.sh @@ -3384,6 +3424,11 @@ fi -DWITH_SHADOW=OFF \ -DWITH_XDMCP=ON \ -DWITH_XINERAMA=ON \ + %if 0%{?suse_version} + -DWITH_HTDIG=OFF \ + %else + -DWITH_HTDIG=ON \ + %endif -DWITH_ARTS=ON \ -DWITH_I8K=ON \ -DWITH_SENSORS=ON \ diff --git a/redhat/core/tdebase/trinity-tdebase-rpmlintrc b/redhat/core/tdebase/trinity-tdebase-rpmlintrc index 8d22f2fc6..55134a9ea 100644 --- a/redhat/core/tdebase/trinity-tdebase-rpmlintrc +++ b/redhat/core/tdebase/trinity-tdebase-rpmlintrc @@ -1,3 +1,4 @@ setBadness('permissions-file-setuid-bit', 0) setBadness('library-without-ldconfig-postun', 0) setBadness('library-without-ldconfig-postin', 0) +setBadness('binary-or-shlib-defines-rpath', 0) -- cgit v1.2.3