--- rpms/smeserver-php-scl/contribs9/smeserver-php-scl.spec	2018/08/15 19:14:41	1.18
+++ rpms/smeserver-php-scl/contribs9/smeserver-php-scl.spec	2019/07/21 03:26:14	1.24
@@ -2,7 +2,7 @@ Summary: SME server php REMI scl
 %define name smeserver-php-scl
 Name: %{name}
 %define version 0.4
-%define release 19
+%define release 25
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -53,9 +53,29 @@ Patch9: smeserver-php-scl-0.4.bz10618-so
 Patch10: smeserver-php-scl-0.4.bz10508-addphp72support.patch
 Patch11: smeserver-php-scl-0.4.bz10508-addphp73support.patch
 Patch12: smeserver-php-scl-0.4.bz10508-translation.patch
-
+Patch13: smeserver-php-scl-0.4-locale-2018-12-14.patch
+Patch14: smeserver-php-scl-0.4-locale-2018-12-23.patch
+Patch15: smeserver-php-scl-0.4.bz10665-horde3-vs-php7.patch
+Patch16: smeserver-php-scl-0.4-bz10774-default-to-global.patch
 
 %changelog
+* Sun Jul 21 2019 Jean-Philipe Pialasse <tests@pialasse.com> 0.4-25.sme
+- default all php options to main php version values [SME: 10774]
+  for all versions. Idea and code from Michael McCarn.
+
+* Sat Dec 29 2018 John Crisp <jcrisp@safendsoundit.co.uk> 0.4-23.sme
+- Fix previous incorrect changelog bug number
+
+* Sat Dec 22 2018 Jean-Philipe Pialasse <tests@pialasse.com> 0.4-22.sme
+- apply locale 2018-12-14 patch
+- fix horde 3 not running with php7 or higher set as php module for httpd [SME: 10667]
+
+* Fri Dec 14 2018 John Crisp <jcrisp@safendsoundit.co.uk> 0.4-21.sme
+- apply locale 2018-12-14 patch
+
+* Tue Dec 11 2018 John Crisp <jcrisp@safendsoundit.co.uk> 0.4-20.sme
+- fix spec file permissions [SME: 10662]
+
 * Wed Aug 15 2018 Jean-Philipe Pialasse <tests@pialasse.com> 0.4-19.sme
 - add php73 support [SME: 10508]
 - fixed translation for php7* versions
@@ -137,6 +157,10 @@ Allow to use different versions of php w
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 %build
 perl createlinks
@@ -151,6 +175,8 @@ rm -f %{name}-%{version}-filelist
     --file /usr/bin/phpscl/php56_REMI 'attr(0770,root,www)' \
     --file /usr/bin/phpscl/php70_REMI 'attr(0770,root,www)' \
     --file /usr/bin/phpscl/php71_REMI 'attr(0770,root,www)' \
+    --file /usr/bin/phpscl/php72_REMI 'attr(0770,root,www)' \
+    --file /usr/bin/phpscl/php73_REMI 'attr(0770,root,www)' \
   $RPM_BUILD_ROOT > %{name}-%{version}-filelist