--- rpms/smeserver-horde/sme10/smeserver-horde.spec	2020/12/11 21:49:17	1.24
+++ rpms/smeserver-horde/sme10/smeserver-horde.spec	2021/03/10 21:43:26	1.30
@@ -4,7 +4,7 @@ Summary: e-smith specific Horde configur
 %define name smeserver-horde
 Name: %{name}
 %define version 1.0.0
-%define release 21
+%define release 25
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -29,6 +29,8 @@ Patch15: smeserver-horde-1.0.0-bz10969-r
 Patch16: smeserver-horde-1.0.0-bz11016-rsyslog-deprecated.patch
 Patch17: smeserver-horde-1.0.0-bz11233-webmail-manager.patch
 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
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -68,10 +70,24 @@ Requires: php-pear-MDB2
 Requires: php-pear-Net-URL2
 Requires: php-pear-XML-Parser2
 Requires: php-pear-XML-RPC2
+Requires: ImageMagick
 
 %changelog
-* Fri Dec 11 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.0-21.sme
-- fix wrong template path for php55 and php56 [SME: 11255]
+* 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]
+- update mail settings for the php-pool [SME: 11431]
+
+* Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.0-24.sme
+- spamd SpamLearning property migrated to spamassassin SpamLearning [SME: 11376]
+
+* Sat Feb 20 2021 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.0-23.sme
+- Configuration is not up to date, hash to update [SME: 11308]
+
+* Fri Dec 11 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.0-22.sme
+- fix wrong template path for php55, php56 and php [SME: 11255]
 
 * Mon Dec 07 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.0-20.sme
 - fix webmail not accessible after enabling from manager [SME: 11233]
@@ -91,7 +107,7 @@ Requires: php-pear-XML-RPC2
 
 * Fri Mar 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.0-15.sme
 - log as admin and not admin@domain for cli tasks [SME: 10910]
-- fix ingo imap preferences [SME:10912]
+- fix ingo imap preferences [SME: 10912]
 
 * Fri Mar 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.0.0-14.sme
 - allow httpd-auth for calendar, tasks access using rpc.php ... [SME: 10908]
@@ -165,10 +181,11 @@ to work on SME Server 10
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
-
 mkdir -p root/var/lib/php/horde/session
 mkdir -p root/var/lib/php/horde/opcache
 mkdir -p root/var/lib/php/horde/tmp
+%patch19 -p1
+%patch20 -p1
 
 %build
 for i in post-install post-upgrade