From 73935f0c613bdb3ff13461ea73215aeef6fd00cc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Apr 2020 16:08:46 +0200 Subject: add conflict between php73-syspaths and php74-syspaths --- php74.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/php74.spec b/php74.spec index 0a93611..48d4671 100644 --- a/php74.spec +++ b/php74.spec @@ -1,6 +1,6 @@ # remirepo spec file for php74 SCL metapackage # -# Copyright (c) 2018-2019 Remi Collet +# Copyright (c) 2018-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -34,7 +34,7 @@ Summary: Package that installs PHP 7.4 Name: %scl_name Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Source0: macros-build @@ -101,6 +101,7 @@ Conflicts: php56-syspaths Conflicts: php70-syspaths Conflicts: php71-syspaths Conflicts: php72-syspaths +Conflicts: php73-syspaths %description syspaths System-wide wrappers for the %{name}-php-cli package. @@ -263,6 +264,9 @@ restorecon -R %{_localstatedir} &>/dev/null || : %changelog +* Thu Apr 9 2020 Remi Collet 1.0-3 +- add conflict between php73-syspaths and php74-syspaths + * Thu Aug 22 2019 Remi Collet 1.0-2 - fix error: Macro %%undefine is a built-in see https://bugzilla.redhat.com/1744583 -- cgit