diff options
Diffstat (limited to 'redhat/extras/trinity-desktop')
| -rw-r--r-- | redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec | 10 | ||||
| -rw-r--r-- | redhat/extras/trinity-desktop/trinity-desktop-3.5.13.2.spec | 3 |
2 files changed, 4 insertions, 9 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 5e1e15108..7f32d520d 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec @@ -24,14 +24,13 @@ # 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 %define _docdir %{_datadir}/doc %define tde_datadir %{tde_prefix}/share %endif Name: trinity-desktop Version: %{tde_version} -Release: 1%{?dist}%{?_variant} +Release: 1%{?dist} License: GPL Summary: Meta-package to install TDE Group: User Interface/Desktops @@ -210,10 +209,7 @@ Requires: trinity-kpilot # Network management # RHEL 6 and openSUSE 11.x: knetworkmanager8 -%if 0%{?rhel} == 6 -Requires: trinity-knetworkmanager8 -%endif -%if 0%{?suse_version} && 0%{?suse_version} <= 1140 +%if 0%{?suse_version} && 0%{?suse_version} <= 1140 || 0%{?rhel} == 6 Requires: trinity-knetworkmanager %endif # Other distros use tdenetworkmanager (since R14) @@ -284,7 +280,7 @@ Requires: trinity-theme-baghira # GLIBC too old on RHEL <= 5 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 -Requires: trinity-twinkle +#Requires: trinity-twinkle %endif %description extras 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 0aa92d42d..c2380e215 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 @@ -1,13 +1,12 @@ # 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 %define _docdir %{_datadir}/doc %define tde_datadir %{tde_prefix}/share %endif Name: trinity-desktop Version: 3.5.13.2 -Release: 2%{?dist}%{?_variant} +Release: 2%{?dist} License: GPL Summary: Meta-package to install TDE Group: User Interface/Desktops |