summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-04-09 16:08:46 +0200
committerRemi Collet <remi@remirepo.net>2020-04-09 16:08:46 +0200
commit73935f0c613bdb3ff13461ea73215aeef6fd00cc (patch)
treee1a1c07ff52dc80517e03bbf47bddb67d2b862f3
parent24fe0734366aee99748182faef5dc6fa42683f47 (diff)
add conflict between php73-syspaths and php74-syspaths
-rw-r--r--php74.spec8
1 files 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 <remi@remirepo.net> 1.0-3
+- add conflict between php73-syspaths and php74-syspaths
+
* Thu Aug 22 2019 Remi Collet <remi@remirepo.net> 1.0-2
- fix error: Macro %%undefine is a built-in
see https://bugzilla.redhat.com/1744583