summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-02-08 14:19:11 +0100
committerRemi Collet <remi@remirepo.net>2019-02-08 14:19:11 +0100
commita7a060db096e9dc2a1e5f50cd73ff183b927211c (patch)
tree663f90a87410a780f5b30ce09d39a207c62da880
parent78627589dae205878702229f863701cf588a4c22 (diff)
fix upgrade patch from other 3rd party repoHEADmaster
-rw-r--r--php-pecl-mcrypt.spec30
1 files changed, 16 insertions, 14 deletions
diff --git a/php-pecl-mcrypt.spec b/php-pecl-mcrypt.spec
index 8ae89d6..966c70f 100644
--- a/php-pecl-mcrypt.spec
+++ b/php-pecl-mcrypt.spec
@@ -19,9 +19,8 @@
Summary: Bindings for the libmcrypt library
Name: %{?scl_prefix}php-pecl-mcrypt
Version: 1.0.2
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: PHP
-Group: Development/Languages
URL: http://pecl.php.net/package/mcrypt
Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
@@ -40,17 +39,19 @@ Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
Provides: %{?scl_prefix}php-%{pecl_name} = 1:%{version}-%{release}
Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = 1:%{version}-%{release}
+Obsoletes: %{?scl_prefix}php-mcrypt < 7.2
+
%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-Obsoletes: php54u-%{pecl_name} <= %{version}
-Obsoletes: php54w-%{pecl_name} <= %{version}
-Obsoletes: php55u-%{pecl_name} <= %{version}
-Obsoletes: php55w-%{pecl_name} <= %{version}
-Obsoletes: php56u-%{pecl_name} <= %{version}
-Obsoletes: php56w-%{pecl_name} <= %{version}
-Obsoletes: php70u-%{pecl_name} <= %{version}
-Obsoletes: php70w-%{pecl_name} <= %{version}
-Obsoletes: php71u-%{pecl_name} <= %{version}
-Obsoletes: php71w-%{pecl_name} <= %{version}
+Obsoletes: php54u-%{pecl_name} < 7.2
+Obsoletes: php54w-%{pecl_name} < 7.2
+Obsoletes: php55u-%{pecl_name} < 7.2
+Obsoletes: php55w-%{pecl_name} < 7.2
+Obsoletes: php56u-%{pecl_name} < 7.2
+Obsoletes: php56w-%{pecl_name} < 7.2
+Obsoletes: php70u-%{pecl_name} < 7.2
+Obsoletes: php70w-%{pecl_name} < 7.2
+Obsoletes: php71u-%{pecl_name} < 7.2
+Obsoletes: php71w-%{pecl_name} < 7.2
Obsoletes: php72u-pecl-%{pecl_name} <= %{version}
Obsoletes: php72w-pecl-%{pecl_name} <= %{version}
%if "%{php_version}" > "7.3"
@@ -59,8 +60,6 @@ Obsoletes: php73w-pecl-%{pecl_name} <= %{version}
%endif
%endif
-Obsoletes: %{?scl_prefix}php-mcrypt < 7.2.0
-
%if 0%{?fedora} < 20 && 0%{?rhel} < 7
# Filter private shared
@@ -219,6 +218,9 @@ fi
%changelog
+* Fri Feb 8 2019 Remi Collet <remi@remirepo.net> - 1.0.2-2
+- fix upgrade patch from other 3rd party repo
+
* Fri Jan 11 2019 Remi Collet <remi@remirepo.net> - 1.0.2-1
- update to 1.0.2