From 9a2332ab992f396f9149e6c5b435dd987bfed8d2 Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Thu, 11 Feb 2010 13:38:52 +0100 Subject: [PATCH] On SLE aria2 is not required, so conflict with too old versions (bnc #578052) --- libzypp.spec.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake index 3ad6f37..b29bdb5 100644 --- a/libzypp.spec.cmake +++ b/libzypp.spec.cmake @@ -62,6 +62,7 @@ Requires: gpg2 Requires: gnupg %endif +%define min_aria_version 1.1.2 # --------------------------------------------------------------- %if 0%{?suse_version} == 1110 # (almost) common codebase, but on SLES11-SP1 (according to Rudi @@ -70,6 +71,9 @@ Requires: gnupg # from po/sle-zypp-po.tar.bz2. %define min_curl_version 7.19.0-11.22 %define use_translation_set sle-zypp +# No requirement, but as we'd use it in case it is present, +# check for a sufficient version: +Conflicts: aria2 < %{min_aria_version} # --------------------------------------------------------------- %else # --------------------------------------------------------------- @@ -77,8 +81,8 @@ Requires: gnupg # need CURLOPT_REDIR_PROTOCOLS: %define min_curl_version 7.19.4 # want aria2: -Requires: aria2 >= 1.1.2 -BuildRequires: aria2 >= 1.1.2 +Requires: aria2 >= %{min_aria_version} +BuildRequires: aria2 >= %{min_aria_version} %endif # --------------------------------------------------------------- -- 2.7.4