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/extras/klamav/klamav-14.0.0.spec | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'redhat/extras/klamav/klamav-14.0.0.spec') diff --git a/redhat/extras/klamav/klamav-14.0.0.spec b/redhat/extras/klamav/klamav-14.0.0.spec index bc6c6b1b4..dd45f3f31 100644 --- a/redhat/extras/klamav/klamav-14.0.0.spec +++ b/redhat/extras/klamav/klamav-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: Frontend for clamav Version: 0.46 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -59,10 +54,10 @@ Url: http://klamav.sourceforge.net/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{tde_pkg}-14.0.0.tar.gz +Source0: %{tde_pkg}-%{tde_version}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 +BuildRequires: trinity-arts-devel >= 2:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -- cgit v1.2.1