diff options
Diffstat (limited to 'redhat/extras')
| -rw-r--r-- | redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec | 6 | ||||
| -rw-r--r-- | redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec | 6 |
2 files changed, 9 insertions, 3 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 diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec index 76871022c..309fea09a 100644 --- a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec +++ b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec @@ -29,11 +29,15 @@ %define tde_libdir %{tde_prefix}/%{_lib} %define tde_tdelibdir %{tde_libdir}/trinity +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif Name: trinity-filesystem Version: %{tde_version} -Release: 1%{?dist} +Release: 1%{?dist}%{?_variant} Summary: Trinity Directory Layout Group: System/Fhs URL: http://www.trinitydesktop.org/ |