From 30fc654ccaafcef016deea224694df7eb3c998a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 11 Apr 2023 17:24:17 +0200 Subject: [PATCH] RPM: update trinity-desktop metapackage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- .../extras/trinity-desktop/trinity-desktop.spec | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec index 164cab7f1..fb1a67e93 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop.spec @@ -138,7 +138,6 @@ Requires: trinity-kdiff3 Requires: trinity-kdirstat Requires: trinity-keep Requires: trinity-kerberostray -#Requires: trinity-kerry Requires: trinity-keximdb Requires: trinity-kftpgrabber Requires: trinity-kile @@ -211,17 +210,13 @@ Requires: trinity-smartcardauth Requires: trinity-soundkonverter Requires: trinity-tastymenu Requires: trinity-tdebluez -%if 0%{?sle_version} <= 150300 && 0%{?rhel} <= 8 Requires: trinity-tde-guidance -%endif Requires: trinity-tde-style-baghira Requires: trinity-tde-style-domino Requires: trinity-tde-style-ia-ora Requires: trinity-tde-style-lipstik Requires: trinity-tde-style-qtcurve -%if 0%{?sle_version} <= 150300 && 0%{?rhel} <= 8 Requires: trinity-tde-systemsettings -%endif Requires: trinity-tdedocker %if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 7 Requires: trinity-tdeio-appinfo @@ -232,6 +227,7 @@ Requires: trinity-tdeio-gopher Requires: trinity-tdeio-locate Requires: trinity-tdeio-sword Requires: trinity-tdeio-umountwrapper +Requires: trinity-tdenetworkmanager Requires: trinity-tdepacman %if 0%{?rhel} != 5 Requires: trinity-tdepowersave @@ -250,16 +246,6 @@ Requires: trinity-twin-style-suse2 Requires: trinity-wlassistant Requires: trinity-yakuake -# Network management -# RHEL 6 and openSUSE 11.x: knetworkmanager8 -%if 0%{?suse_version} && 0%{?suse_version} <= 1140 || 0%{?rhel} == 6 -Requires: trinity-knetworkmanager -%endif -# Other distros use tdenetworkmanager (since R14) -%if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} -Requires: trinity-tdenetworkmanager -%endif - # Power management Obsoletes: trinity-tde-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release}