From 9165f598d04efce920663e40b398c4388d585d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 8 Sep 2013 12:17:12 +0200 Subject: RPM Packaging: updates for 3.5.13.2 --- redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'redhat/extras/trinity-desktop') diff --git a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec index 72e7254c2..98fcf9277 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec @@ -112,7 +112,7 @@ Requires: trinity-digikam Requires: trinity-dolphin Requires: trinity-filelight Requires: trinity-gwenview -Requires: trinity-gwenview-i18n +#Requires: trinity-gwenview-i18n Requires: trinity-k3b Requires: trinity-kaffeine Requires: trinity-kaffeine-mozilla @@ -192,11 +192,13 @@ Obsoletes: trinity-kgtk-qt3 # RHEL, openSUSE 12: no Beagle library Obsoletes: trinity-kerry -# RHEL 6 only: knetworkmanager8 -# knetworkmanager9 is too unstable for now. +# RHEL 6 and openSUSE 11.x: knetworkmanager8 %if 0%{?rhel} == 6 Requires: trinity-knetworkmanager %endif +%if 0%{?suse_version} && 0%{?suse_version} <= 1140 +Requires: trinity-knetworkmanager +%endif # RHEL 4 %if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} @@ -218,6 +220,8 @@ Requires: trinity-tdesvn ########## +%if 0 + %package extras Group: User Interface/Desktops Summary: Meta-package to install all extras (unofficial) TDE packages @@ -256,6 +260,8 @@ Requires: trinity-twinkle %files extras +%endif + ########## %package all -- cgit v1.2.1