--- rpms/e-smith-ibays/sme10/e-smith-ibays.spec	2021/03/09 23:24:41	1.17
+++ rpms/e-smith-ibays/sme10/e-smith-ibays.spec	2022/04/16 06:47:24	1.20
@@ -1,10 +1,10 @@
-# $Id: e-smith-ibays.spec,v 1.16 2021/03/08 20:00:37 jpp Exp $
+# $Id: e-smith-ibays.spec,v 1.19 2021/03/10 06:00:27 jpp Exp $
 
 Summary: e-smith server and gateway - ibays module
 %define name e-smith-ibays
 Name: %{name}
 %define version 2.6.0
-%define release 15
+%define release 18
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -19,13 +19,16 @@ Patch5: e-smith-ibays-2.6.0-bz10968-remo
 Patch6: e-smith-ibays-2.6.0-bz11139-update.patch
 Patch7: e-smith-ibays-2.6.0-bz11412-update-php-properties.patch
 Patch8: e-smith-ibays-2.6.0-bz8150-SSLproperty2SSLRequireSSL.patch
+Patch9: e-smith-ibays-2.6.0-bz11407-force-https-on-DAV-and-httpauth.patch
+Patch10: e-smith-ibays-2.6.0-bz11774-require.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.13.15-76
 Requires: perl(CGI::FormMagick)
 Requires: e-smith-formmagick >= 1.4.0-12
-Conflicts: e-smith-apache < 0.1.1
+#Conflicts: e-smith-apache < 0.1.1
+Requires: e-smith-apache >= 2.6.0-19
 BuildRequires: perl, perl(Test::Inline)
 BuildRequires: e-smith-devtools >= 1.11.0-03
 AutoReqProv: no
@@ -35,6 +38,16 @@ AutoReqProv: no
 e-smith server and gateway software - ibays module.
 
 %changelog
+* Sat Apr 16 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-18.sme
+- fix  AH01797: client denied by server conf [SME: 11774]
+  use new require syntax for httpd 2.4
+
+* Wed Mar 10 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-17.sme
+- fix patch for SSLRequireSSL [SME: 8150]
+
+* Tue Mar 09 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-16.sme
+- force https if auth or dav are enabled  [SME: 11407]
+
 * Tue Mar 09 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-15.sme
 - merge SSL and SSLRequireSSL properties [SME: 8150]
   now SSLRequireSSL will force SSL to the html ibay directory and redirect to https
@@ -402,6 +415,8 @@ e-smith server and gateway software - ib
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 /bin/mkdir -p root/var/cache/e-smith/files/ibays