From 972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 30 Aug 2015 12:27:30 +0200 Subject: RPM packaging: massive update SPEC files --- redhat/main/tdebase/tdebase-14.0.0.spec | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'redhat/main/tdebase/tdebase-14.0.0.spec') diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec index 409761703..2eef6ba9f 100644 --- a/redhat/main/tdebase/tdebase-14.0.0.spec +++ b/redhat/main/tdebase/tdebase-14.0.0.spec @@ -37,15 +37,10 @@ %define tdm_datadir %{tde_datadir}/apps/%{tdm} %define starttde starttde -# 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 - Name: trinity-%{tde_pkg} Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Trinity Base Programs Group: System/GUI/Other URL: http://www.trinitydesktop.org/ @@ -3621,7 +3616,7 @@ fi %endif %{!?with_kbdledsync:-DBUILD_TDEKBDLEDSYNC=OFF} \ %{!?with_tsak:-DBUILD_TSAK=OFF} \ -%if 0%{?fedora} >= 22 +%if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320 -DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \ %endif .. -- cgit v1.2.1