diff --git a/smeserver-apache.spec b/smeserver-apache.spec index 0d5b753..e64446f 100644 --- a/smeserver-apache.spec +++ b/smeserver-apache.spec @@ -4,7 +4,7 @@ Summary: smeserver server and gateway - apache module %define name smeserver-apache Name: %{name} %define version 11.0.0 -%define release 2 +%define release 3 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -23,15 +23,15 @@ Obsoletes: mod_auth_external Obsoletes: e-smith-proxypass Obsoletes: e-smith-apache-proxy # for the new httpd 2.4 syntax -Conflicts: e-smith-ibays < 2.6.0-19 +Conflicts: smeserver-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: smeserver-proxy < 5.6.0-11 Conflicts: e-smith-manager < 2.8.0-36 AutoReqProv: no BuildRequires: smeserver-devtools >= 1.11.0-12 +Provides: e-smith-apache = %{version}-%{release} -Provides: e-smith-apache %description smeserver server and gateway software - apache module. @@ -70,8 +70,11 @@ if [ $1 -gt 1 ] ; then fi %changelog +* Mon Mar 25 2024 Jean-Philippe Pialasse 11.0.0-3.sme +- conflict with smeserver-proxy + * Sat Mar 23 2024 Brian Read 11.0.0-2.sme -- Change Requires: e-smith- to Requires:smeserver- +- Change Requires: e-smith- to Requires: smeserver- * Sat Mar 23 2024 Brian Read 11.0.0-1.sme - Update Release and Version to base version and 1st release for SME11 [SME: 12518]