summaryrefslogtreecommitdiffstats
path: root/redhat/applications/tde-guidance
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2015-06-29 20:17:57 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2015-06-29 20:17:57 +0200
commit2835777e9ae7bde053e0da2f083ee020f26ea04a (patch)
tree8695f4161ce1d52053a016a69712dcd8cea97d4d /redhat/applications/tde-guidance
parentd3c1f8ab667376639b6ff83e4eff50cd861fe5d2 (diff)
downloadtde-packaging-2835777e9ae7bde053e0da2f083ee020f26ea04a.tar.gz
tde-packaging-2835777e9ae7bde053e0da2f083ee020f26ea04a.zip
RPM Packaging: massive update spec files
Diffstat (limited to 'redhat/applications/tde-guidance')
-rw-r--r--redhat/applications/tde-guidance/tde-guidance-14.0.0.spec20
1 files changed, 11 insertions, 9 deletions
diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
index 2a3803e9c..cde6fa645 100644
--- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
+++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package tde-guidance (version R14.0.0)
+# spec file for package tde-guidance (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -17,7 +17,9 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tde-guidance
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
@@ -146,14 +148,14 @@ Requires: python
Requires: hwdata
%endif
-Requires: %{name}-backends = %{version}-%{release}
+Requires: %{name}-backends = %{?epoch:%{epoch}:}%{version}-%{release}
# POWERMANAGER support (requires HAL)
#define with_powermanager 1
Obsoletes: trinity-tde-guidance-powermanager
-Obsoletes: trinity-guidance < %{version}-%{release}
-Provides: trinity-guidance = %{version}-%{release}
+Obsoletes: trinity-guidance < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-guidance = %{?epoch:%{epoch}:}%{version}-%{release}
%description
Guidance currently consists of four programs designed to help you
@@ -222,8 +224,8 @@ Requires: hwdata
%endif
Requires: python
-Obsoletes: trinity-guidance-backends < %{version}-%{release}
-Provides: trinity-guidance-backends = %{version}-%{release}
+Obsoletes: trinity-guidance-backends < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-guidance-backends = %{?epoch:%{epoch}:}%{version}-%{release}
%description backends
This package contains the platform neutral backends used in the
@@ -246,11 +248,11 @@ Guidance configuration tools.
%package powermanager
Group: Applications/Utilities
Summary: HAL based power manager applet [Trinity]
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: hal
-Obsoletes: trinity-guidance-powermanager < %{version}-%{release}
-Provides: trinity-guidance-powermanager = %{version}-%{release}
+Obsoletes: trinity-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-guidance-powermanager = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{tde_prefix}" == "/usr"
Conflicts: guidance-power-manager