--- rpms/smeserver-php/sme10/smeserver-php.spec	2021/03/08 07:20:02	1.35
+++ rpms/smeserver-php/sme10/smeserver-php.spec	2021/06/02 15:16:54	1.45
@@ -1,5 +1,5 @@
 %define version 3.0.0
-%define release 28
+%define release 35
 %define name smeserver-php
 
 
@@ -34,6 +34,12 @@ Patch20: smeserver-php-3.0.0-bz11413-php
 Patch21: smeserver-php-3.0.0-bz11401-empty-property-not-honored.patch
 Patch22: smeserver-php-3.0.0-bz10907-phpfile-exist.patch
 Patch23: smeserver-php-3.0.0-bz10890-allowphpembdedcode.patch
+Patch24: smeserver-php-3.0.0-bz11427-timeout.patch
+Patch25: smeserver-php-3.0.0-bz11411-uniformizePhpProperties.patch
+Patch26: smeserver-php-3.0.0-bz11412-phptempsdirs.patch
+Patch27: smeserver-php-3.0.0-bz11452-bz5759.patch
+Patch28: smeserver-php-3.0.0-bz11422-logging.patch
+Patch29: smeserver-php-3.0.0-bz11573.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: x86_64
@@ -265,6 +271,12 @@ Manage PHP FPM pools, and switch between
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
+%patch25 -p1 -F4
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
 
 %build
 perl createlinks
@@ -308,7 +320,7 @@ MORE_DATA={ PHP_VERSION => '$phpver'}' >
 #drop in systemd file
 %{__mkdir_p} root/usr/lib/systemd/system/php$phpver-php-fpm.service.d
 echo "[Install]" > root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf
-echo "WantedBy=sme-server.target" > root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf
+echo "WantedBy=sme-server.target" >> root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf
  
 done
 
@@ -366,9 +378,33 @@ rm -rf $RPM_BUILD_ROOT
 %preun
 
 %changelog
+* Wed Jun 02 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-35.sme
+- fix missing Install section for systemd drop in [SME: 11612]
+
+* Wed Apr 21 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-34.sme
+- fix open_basedir for pool missing /var/lib/php/$ibay/ [SME: 11573]
+
+* Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-33.sme
+- clean rsyslog syntax for php [SME: 11422]
+
+* Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.0.0-32.sme
+- add /usr/share/pear and /usr/share/php to basedir [SME: 5759]
+- fix last big differences between module setting and fpm [SME: 11452]
+
+* Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-31.sme
+- move from e-smith-ibays handling of temps dirs [SME: 11412]
+- improve httpd fragment [SME: 11401]
+
+* Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-30.sme
+-  uniformize php related properties between ibays and php [SME: 11411]
+   tidy fragments for php-fpm and ibays
+-  revert patch for timeouts [SME: 11427]
+
 * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-28.sme
 - filter non existing php script [SME: 10907]
 - allow php embded files per ibay using AllowPHTML [SME: 10890]
+- add timeout property in case of need for long running script [SME: 11427]
+  e.g. upgrade of a wiki
 
 * Mon Mar 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-27.sme
 - String not honoured as php-fpm but as default [SME: 11401]