--- rpms/e-smith-apache/sme10/e-smith-apache.spec 2022/07/25 08:24:04 1.24 +++ rpms/e-smith-apache/sme10/e-smith-apache.spec 2022/07/25 08:52:20 1.26 @@ -1,10 +1,10 @@ -# $Id: e-smith-apache.spec,v 1.23 2022/07/24 02:24:48 jpp Exp $ +# $Id: e-smith-apache.spec,v 1.25 2022/07/25 08:51:14 jpp Exp $ Summary: e-smith server and gateway - apache module %define name e-smith-apache Name: %{name} %define version 2.6.0 -%define release 21 +%define release 22 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -35,7 +35,12 @@ Obsoletes: distcache <= 1.4.5 Obsoletes: mod_auth_external Obsoletes: e-smith-proxypass Obsoletes: e-smith-apache-proxy -Conflicts: e-smith-ibays < 1.0.2 +# for the new httpd 2.4 syntax +Conflicts: e-smith-ibays < 2.6.0-19 +Conflicts: smeserver-horde < 1.0.0-32 +Conflicts: smeserver-php < 3.0.0-43 +Conflicts: e-smith-proxy < 5.6.0-11 +Conflicts: e-smith-manager < 2.8.0-36 AutoReqProv: no BuildRequires: e-smith-devtools >= 1.11.0-12 @@ -90,8 +95,9 @@ if [ $1 -gt 1 ] ; then fi %changelog -* Mon Jul 25 2022 Jean-Philippe Pialasse 2.6.0-21.sme +* Mon Jul 25 2022 Jean-Philippe Pialasse 2.6.0-22.sme - reverting last change [SME: 9375] +- add conflict on older ibays, php, horde, proxy, manager rpms * Sun Jul 24 2022 Jean-Philipe Pialasse 2.6.0-20.sme - removing mod_access_compat [SME: 9375]