--- rpms/smeserver-horde/sme10/smeserver-horde.spec	2021/03/10 21:43:26	1.30
+++ rpms/smeserver-horde/sme10/smeserver-horde.spec	2023/02/06 04:54:13	1.41
@@ -4,7 +4,7 @@ Summary: e-smith specific Horde configur
 %define name smeserver-horde
 Name: %{name}
 %define version 1.0.0
-%define release 25
+%define release 34
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -31,10 +31,19 @@ Patch17: smeserver-horde-1.0.0-bz11233-w
 Patch18: smeserver-horde-1.0.0-bz11255.patch
 Patch19: smeserver-horde-1.0.0-bz11308-configurationhash.patch
 Patch20: smeserver-horde-1.0.0-bz10945-bz11443-bz11433-bz11431.patch
+Patch21: smeserver-horde-1.0.0-bz11422-logging.patch
+Patch22: smeserver-horde-1.0.0-bz11489.patch
+Patch23: smeserver-horde-1.0.0-bz11628-ingofilters-sieve.patch
+Patch24: smeserver-horde-1.0.0-bz11738-multi-admin-user.patch
+Patch25: smeserver-horde-1.0.0-bz11694-alarm.patch
+Patch26: smeserver-horde-1.0.0-bz11694-remindfix.patch
+Patch27: smeserver-horde-1.0.0-bz11945-require.patch
+Patch28: smeserver-horde-1.0.0-bz12293-php_path.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.9.44, php-horde-horde >= 5.2, mariadb
+Requires: e-smith-apache >= 2.6.0-19
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
 Obsoletes: horde-h3, e-smith-horde, imp-h3, e-smith-imp
@@ -73,8 +82,36 @@ Requires: php-pear-XML-RPC2
 Requires: ImageMagick
 
 %changelog
+* Sun Feb 05 2023 Jean-Philippe Pialasse <tests@pialasse.com> 1.0.0-34.sme
+- use php full path for mysql.init scripts [SME: 12296]
+
+* Thu May 26 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.0.0-33.sme
+- fix invalid domain if ForcePrimaryDomain is enabled [SME: 11980]
+- fix $ldapServer is commented out if Horde ForcePrimaryDomain is disabled [SME: 11981]
+
+* Sun Apr 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.0.0-32.sme
+- use httpd 2.4 access control syntax [SME: 11945]
+
+* Sat Apr 16 2022 Terry Fage <terry@fage.id.au> 1.0.0-31.sme
+- fix previous patch error extra line [SME: 11694]
+
+* Tue Apr 05 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.0.0-30.sme
+- fix alarm noise when disabled [SME: 11694]
+
+* Sun Nov 07 2021 Greg Simpson <gsimpson@mophilly.com> 1.0.0-29.sme
+- Syntax error, unexpected '(T_STRING), expecting ')' [SME: 11738]
+- thanks to zsolt vasarhelyi for patch test
+
+* Sat Sep 18 2021 Terry Fage <terryf@ozemail.com.au> 1.0.0-28.sme
+- Ingo filters TLS error if sieve is enabled [SME: 11628]
+
+* Wed Mar 24 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.0.0-27.sme
+- fix missing call to perl module emsith::php  [SME: 11489]
+
+* Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.0.0-26.sme
+- clean rsyslog syntax for horde [SME: 11422]
+
 * Wed Mar 10 2021 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.0-25.sme
-- apply the configuration hash of [SME: 11308]
 - improved php basedir, with filtering of noise for gpg [SME: 10945]
 - force SSL for horde [SME: 11443]
 - fix horde not honoring switch to php-fpm 5.4 [SME: 11433]
@@ -186,6 +223,14 @@ mkdir -p root/var/lib/php/horde/opcache
 mkdir -p root/var/lib/php/horde/tmp
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
 
 %build
 for i in post-install post-upgrade