RPM packaging: massive update SPEC files

4 files changed, 4 insertions, 24 deletions

diff --git a/redhat/applications/kerry/kerry-14.0.0.spec b/redhat/applications/kerry/kerry-14.0.0.spec
index dd93efea6..887f42eb5 100644
--- a/redhat/applications/kerry/kerry-14.0.0.spec
+++ b/redhat/applications/kerry/kerry-14.0.0.spec
@@ -21,11 +21,6 @@
 %define tde_version 14.0.0
 %endif
 
-# 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
-
 # TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -46,7 +41,7 @@
 Name:			trinity-%{tde_pkg}
 Summary:		a TDE frontend for the Beagle desktop search daemon [Trinity]
 Version:		0.2.1
-Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
 
 License:		GPLv2+
 Group:			Applications/Utilities
diff --git a/redhat/applications/kerry/kerry-3.5.13.1.spec b/redhat/applications/kerry/kerry-3.5.13.1.spec
index 9bc265341..6dcd58b9c 100644
--- a/redhat/applications/kerry/kerry-3.5.13.1.spec
+++ b/redhat/applications/kerry/kerry-3.5.13.1.spec
@@ -1,11 +1,6 @@
 # Default version for this component
 %define kdecomp kerry
 
-# 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
-
 # TDE 3.5.13 specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -26,7 +21,7 @@
 Name:		trinity-%{kdecomp}
 Summary:	a KDE frontend for the Beagle desktop search daemon [Trinity]
 Version:	0.2.1
-Release:	2%{?dist}%{?_variant}
+Release:	2%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Utilities
diff --git a/redhat/applications/kerry/kerry-3.5.13.2.spec b/redhat/applications/kerry/kerry-3.5.13.2.spec
index 09949032e..681761c48 100644
--- a/redhat/applications/kerry/kerry-3.5.13.2.spec
+++ b/redhat/applications/kerry/kerry-3.5.13.2.spec
@@ -1,11 +1,6 @@
 # Default version for this component
 %define tdecomp kerry
 
-# 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
-
 # TDE 3.5.13 specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -26,7 +21,7 @@
 Name:		trinity-%{tdecomp}
 Summary:	a KDE frontend for the Beagle desktop search daemon [Trinity]
 Version:	0.2.1
-Release:	3%{?dist}%{?_variant}
+Release:	3%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Utilities
diff --git a/redhat/applications/kerry/kerry-3.5.13.spec b/redhat/applications/kerry/kerry-3.5.13.spec
index 49b070395..3719aeb98 100644
--- a/redhat/applications/kerry/kerry-3.5.13.spec
+++ b/redhat/applications/kerry/kerry-3.5.13.spec
@@ -1,11 +1,6 @@
 # Default version for this component
 %define kdecomp kerry
 
-# 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
-
 # TDE 3.5.13 specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -26,7 +21,7 @@
 Name:		trinity-%{kdecomp}
 Summary:	a KDE frontend for the Beagle desktop search daemon [Trinity]
 Version:	0.2.1
-Release:	1%{?dist}%{?_variant}
+Release:	1%{?dist}
 
 License:	GPLv2+
 Group:		Applications/Utilities