From 796ced64596565d4a15084adbe2622d37e8219d5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 17 Sep 2015 15:42:11 +0200 Subject: php-pear: improve obsoletes --- php-pear.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'php-pear.spec') diff --git a/php-pear.spec b/php-pear.spec index 0301a6e..7bba454 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -34,7 +34,7 @@ Summary: PHP Extension and Application Repository framework Name: %{?scl_prefix}php-pear Version: 1.9.5 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 1 # PEAR, Archive_Tar, XML_Util, Console_Getopt are BSD # Structures_Graph is LGPLv3+ @@ -95,19 +95,11 @@ Obsoletes: php53-pear <= %{version} Obsoletes: php53u-pear <= %{version} Obsoletes: php54-pear <= %{version} Obsoletes: php54w-pear <= %{version} -%if "%{php_version}" > "5.5" Obsoletes: php55u-pear <= %{version} Obsoletes: php55w-pear <= %{version} -%endif -%if "%{php_version}" > "5.6" Obsoletes: php56u-pear <= %{version} Obsoletes: php56w-pear <= %{version} %endif -%if "%{php_version}" > "7.0" -Obsoletes: php70u-pear <= %{version} -Obsoletes: php70w-pear <= %{version} -%endif -%endif %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}} # Archive_Tar requires 5.2 @@ -401,6 +393,9 @@ fi %changelog +* Thu Sep 17 2015 Remi Collet 1:1.9.5-14 +- improve obsoletes + * Thu Jul 23 2015 Remi Collet 1:1.9.5-13 - fix default values in rpm macro file (instead of undefined) -- cgit