From d9294e241582181096fd8cec6e8fc02e20e0fbc2 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sat, 16 Jun 2012 23:19:08 +0200 Subject: RHEL/Fedora: updates trinity-desktop --- redhat/extras/trinity-desktop/trinity-desktop.spec | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'redhat/extras/trinity-desktop/trinity-desktop.spec') diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec index 761e05e75..ade6d7490 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop.spec @@ -1,18 +1,12 @@ -# Default version for this component -%if "%{?version}" == "" -%define version 3.5.13 -%endif -%define release 3 - # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc %endif Name: trinity-desktop -Version: %{version} -Release: %{?release}%{?dist}%{?_variant} +Version: 3.5.13 +Release: 4%{?dist}%{?_variant} License: GPL Summary: Meta-package to install TDE Group: User Interface/Desktops @@ -74,7 +68,7 @@ Requires: trinity-kdeaddons-extras >= %{version} Requires: trinity-kdebase-extras >= %{version} Requires: trinity-kdegraphics-extras >= %{version} Requires: trinity-kdemultimedia-extras >= %{version} -Requires: trinity-kdenetwork-extras >= %{version} +#Requires: trinity-kdenetwork-extras >= %{version} Requires: trinity-kdeutils-extras >= %{version} %description extras @@ -118,7 +112,6 @@ Summary: Yum configuration files for Trinity %if 0%{?rhel} > 0 %__sed %{SOURCE1} \ -e 's/\$releasever/%{rhel}/g' \ - -e 's/-rhel/-el%{rhel}/g' \ >%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13-el%{rhel}.repo %endif @@ -136,6 +129,9 @@ Summary: Yum configuration files for Trinity %{_sysconfdir}/yum.repos.d/*.repo %changelog +* Wed Jun 06 2012 Francois Andriot - 3.5.13-4 +- Enable mirrorlist + * Wed Nov 30 2011 Francois Andriot - 3.5.13-3 - Fix repo files name and content -- cgit v1.2.3