summaryrefslogtreecommitdiffstats
path: root/redhat/main/tdenetwork
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2015-08-30 12:27:30 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2015-08-30 12:27:30 +0200
commit972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2 (patch)
treeab6620583bc880bd61cceb0058ecc1f7e896b992 /redhat/main/tdenetwork
parente5f2386a7884932cffd7c862b6ddedbd2e8a6810 (diff)
downloadtde-packaging-972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2.tar.gz
tde-packaging-972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2.zip
RPM packaging: massive update SPEC files
Diffstat (limited to 'redhat/main/tdenetwork')
-rw-r--r--redhat/main/tdenetwork/tdenetwork-14.0.0.spec7
-rw-r--r--redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec7
2 files changed, 2 insertions, 12 deletions
diff --git a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
index 82b3d5dac..ab72ef950 100644
--- a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
@@ -39,11 +39,6 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%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
-
# Avoids relinking, which breaks consolehelper
%define dont_relink 1
@@ -52,7 +47,7 @@ Name: trinity-%{tde_pkg}
Summary: Trinity Desktop Environment - Network Applications
Group: Applications/Internet
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
diff --git a/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec b/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec
index d9af44ab2..d3099a57e 100644
--- a/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec
+++ b/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec
@@ -36,11 +36,6 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%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
-
# Avoids relinking, which breaks consolehelper
%define dont_relink 1
@@ -49,7 +44,7 @@ Name: trinity-%{tde_pkg}
Summary: Trinity Desktop Environment - Network Applications
Group: Applications/Internet
Version: %{tde_version}
-Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}