summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kdiff3
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/applications/kdiff3
parente5f2386a7884932cffd7c862b6ddedbd2e8a6810 (diff)
downloadtde-packaging-972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2.tar.gz
tde-packaging-972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2.zip
RPM packaging: massive update SPEC files
Diffstat (limited to 'redhat/applications/kdiff3')
-rw-r--r--redhat/applications/kdiff3/kdiff3-14.0.0.spec2
-rw-r--r--redhat/applications/kdiff3/kdiff3-3.5.13.2.spec7
2 files changed, 2 insertions, 7 deletions
diff --git a/redhat/applications/kdiff3/kdiff3-14.0.0.spec b/redhat/applications/kdiff3/kdiff3-14.0.0.spec
index 635846618..b270ca5c9 100644
--- a/redhat/applications/kdiff3/kdiff3-14.0.0.spec
+++ b/redhat/applications/kdiff3/kdiff3-14.0.0.spec
@@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.9.91
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories.
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/
diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec
index 92c2bf2a8..b1824f49f 100644
--- a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec
+++ b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec
@@ -2,11 +2,6 @@
%define tde_pkg kdiff3
%define tde_version 3.5.13.2
-# 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
@@ -27,7 +22,7 @@
Name: trinity-%{tde_pkg}
Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories.
Version: 0.9.91
-Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}
License: GPLv2+
Group: Applications/Utilities