--- rpms/smeserver-php/sme10/smeserver-php.spec	2020/03/25 02:36:10	1.8
+++ rpms/smeserver-php/sme10/smeserver-php.spec	2020/11/09 02:36:48	1.17
@@ -1,5 +1,5 @@
 %define version 3.0.0
-%define release 7
+%define release 15
 %define name smeserver-php
 
 
@@ -16,8 +16,12 @@ Patch2: smeserver-php-fpm-0.1.1-bz10879-
 Patch3: smeserver-php-fpm-0.1.1-bz10877-pool-logs.patch
 Patch4: smeserver-php-3.0.0-bz10888-sys_temp_dir.patch
 Patch5: smeserver-php-fpm-0.1.1-bz0335-fix2.patch
-Patch6:  smeserver-php-fpm-0.1.1-bz10335-fix3-systemd-units.patch
+Patch6: smeserver-php-fpm-0.1.1-bz10335-fix3-systemd-units.patch
 Patch7: smeserver-php-3.0.0-bz10891-php.ini-allversions.patch
+Patch8: smeserver-php-3.0.0-bz10904-pass-auth-token-to-fpm.patch
+Patch9: smeserver-php-3.0.0-bz8787-phpmail.patch
+Patch10: smeserver-php-3.0.0-bz11014.sme-server.target.patch
+Patch11: smeserver-php-3.0.0-bz11087-webapps.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: x86_64
@@ -26,6 +30,7 @@ BuildRequires: e-smith-devtools
 Requires: e-smith-base >= 5.6.0
 Provides: e-smith-php = %{version}-%{release}
 Obsoletes: e-smith-php < %{version}
+Provides: smeserver-webapps-common
 
 Requires: tmpwatch
 Requires: logrotate
@@ -209,6 +214,10 @@ Manage PHP FPM pools, and switch between
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 perl createlinks
@@ -245,7 +254,8 @@ done
 #php5*
 for phpver in  "55" ; do
 #cp php56 metadata
-cp -a  root/etc/e-smith/templates.metadata/opt/remi/php56 root/etc/e-smith/templates.metadata/opt/remi/php$phpver
+mkdir -p  root/etc/e-smith/templates.metadata/opt/remi/php$phpver
+cp -a  root/etc/e-smith/templates.metadata/opt/remi/php56/* root/etc/e-smith/templates.metadata/opt/remi/php$phpver
 #sed inplace
 find root/etc/e-smith/templates.metadata/opt/remi/php$phpver  -type f -print0 | xargs -0 sed -i 's/56/'$phpver'/g'
 done
@@ -253,7 +263,8 @@ done
 # php7*
 for phpver in  "72" "73" "74"; do
 #cp ph70 metada
-cp -a  root/etc/e-smith/templates.metadata/etc/opt/remi/php70 root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver
+mkdir -p root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver/
+cp -a  root/etc/e-smith/templates.metadata/etc/opt/remi/php70/* root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver/
 #sed inplace
 find root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver  -type f -print0 | xargs -0 sed -i 's/70/'$phpver'/g'
 done
@@ -293,6 +304,30 @@ rm -rf $RPM_BUILD_ROOT
 %preun
 
 %changelog
+* Sun Nov 08 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-15.sme
+- improve integration of webapps : virtualhost and event [SME: 11087]
+
+* Wed Sep 30 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-14.sme
+- enable php services for sme-server.target [SME: 11014]
+
+* Tue Jun 23 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-13.sme
+- move and fix link to start services units [SME: 10960]
+
+* Fri Mar 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-12.sme
+- fix typo in  smeserver-php-3.0.0-bz10904-pass-auth-token-to-fpm.patch [SME: 10904]
+
+* Thu Mar 26 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-11.sme
+- help monitoring email sent by php [SME: 8787]
+
+* Thu Mar 26 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-9.sme
+- move auto_prepend_file from php.ini to php-fpm.d [SME: 10904]
+  add /usr/share/php in open_basedir if dfined to allow execution of auto_prepend_file
+- fix templates-metadata path fot php 55 72 73 74
+
+* Tue Mar 24 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-8.sme
+- transfer SERVER auth variables from httpd server to php-fpm pool [SME: 10904]
+  this allow easy auth for php app using httpd auth as if using php module
+
 * Tue Mar 24 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-7.sme
 - templating all php.ini for all available version [SME: 10891]
   expanded using webapps-update, smeserver-php-update, console-save and bootstrap-console-save