summaryrefslogtreecommitdiffstats
path: root/redhat/extras/trinity-desktop
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-12-22 10:26:41 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2014-12-22 10:26:41 +0100
commit430c48787e46116f09139ae549ffe8e60ba1f89d (patch)
tree5d4feb09c36062e854c73c649bfe42d3a52b17d3 /redhat/extras/trinity-desktop
parentf0e09cb4f6928c75afde31e612c8dcee998f5340 (diff)
downloadtde-packaging-430c48787e46116f09139ae549ffe8e60ba1f89d.tar.gz
tde-packaging-430c48787e46116f09139ae549ffe8e60ba1f89d.zip
RPM packaging: updates
Diffstat (limited to 'redhat/extras/trinity-desktop')
-rw-r--r--redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec6
1 files changed, 4 insertions, 2 deletions
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
index a93b07673..81d133601 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
@@ -190,14 +190,16 @@ Requires: trinity-kpilot
# Network management
# RHEL 6 and openSUSE 11.x: knetworkmanager8
%if 0%{?rhel} == 6
-Requires: trinity-knetworkmanager
+Requires: trinity-knetworkmanager8
%endif
%if 0%{?suse_version} && 0%{?suse_version} <= 1140
Requires: trinity-knetworkmanager
%endif
# Other distros use tdenetworkmanager (since R14)
-%if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
Requires: trinity-tdenetworkmanager
+Obsoletes: trinity-knetworkmanager
+Obsoletes: trinity-knetworkmanager8
%endif
# Power management