--- rpms/e-smith-apache/sme10/e-smith-apache.spec	2021/11/15 18:10:58	1.19
+++ rpms/e-smith-apache/sme10/e-smith-apache.spec	2022/07/25 08:51:14	1.25
@@ -1,10 +1,10 @@
-# $Id: e-smith-apache.spec,v 1.18 2021/09/16 18:32:54 jpp Exp $
+# $Id: e-smith-apache.spec,v 1.24 2022/07/25 08:24:04 jpp Exp $
 
 Summary: e-smith server and gateway - apache module
 %define name e-smith-apache
 Name: %{name}
 %define version 2.6.0
-%define release 16
+%define release 21
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -21,6 +21,8 @@ Patch7: e-smith-apache-2.6.0-bz11123-bz1
 Patch8: e-smith-apache-2.6.0-bz10826-defaultSSLCert-if-file-does-not-exist.patch
 Patch9: e-smith-apache-2.6.0-bz11551-httpsForceLocalOnly.patch
 Patch10: e-smith-apache-2.6.0-bz11760-moremodules.patch
+Patch11: e-smith-apache-2.6.0-bz11867.patch
+Patch12: e-smith-apache-2.6.0-bz9375-Require.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -33,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
 
@@ -54,6 +61,8 @@ rm -rf  root/var/service/ root/service/
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 perl createlinks
@@ -86,6 +95,21 @@ if [ $1 -gt 1 ] ; then
 fi
 
 %changelog
+* Mon Jul 25 2022 Jean-Philippe Pialasse <tests@pialasse.com> 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 <tests@pialasse.com> 2.6.0-20.sme
+- removing mod_access_compat [SME: 9375]
+
+* Sat Apr 16 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-19.sme
+- convert httpd 2.2 allow,deny to Require for 2.4 [SME: 9375]
+- use maxsize, not size [SME: 11867]
+
+* Fri Feb 18 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-18.sme
+- use logrotate.d instead of event action [SME: 11867]
+  use size to force log rotate before normal delay
+
 * Mon Nov 15 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-16.sme
 - add modules ldap authnz_ldap and proxy_wstunnel [SME: 11760]
   previously provided by webapps-common