--- rpms/smeserver-php/sme10/smeserver-php.spec	2021/01/27 20:08:47	1.26
+++ rpms/smeserver-php/sme10/smeserver-php.spec	2021/02/21 05:42:28	1.28
@@ -1,5 +1,5 @@
 %define version 3.0.0
-%define release 23
+%define release 24
 %define name smeserver-php
 
 
@@ -27,6 +27,8 @@ Patch13: smeserver-php-3.0.0-bz11173-bz1
 Patch14: smeserver-php-3.0.0-bz11267-ibay-php-version.patch
 Patch15: smeserver-php-3.0.0-bz11287-fix-event-links.patch
 Patch16: smeserver-php-3.0.0-bz11325-logging.patch
+Patch17: smeserver-php-3.0.0-bz11287-pooldir.patch
+Patch18: smeserver-php-3.0.0-bz11295-addphp80.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: x86_64
@@ -206,6 +208,26 @@ Requires: php74-php-process
 Requires: php74-php-snmp
 Requires: php74-php, php74-php-enchant , php74-php-pdo php74-php-tidy ,  php74-php-mysqlnd php74-php-pecl-zip
 
+# PHP 8.0
+Requires: php80-php-cli
+Requires: php80-php-ldap
+Requires: php80-php-imap
+Requires: php80-php-gd
+Requires: php80-php-xml
+Requires: php80-php-xmlrpc
+Requires: php80-php-soap
+Requires: php80-php-opcache
+Requires: php80-php-fpm
+Requires: php80-php-mbstring
+Requires: php80-php-mysql
+Requires: php80-php-json
+Requires: php80-php-bcmath
+Requires: php80-php-intl
+Requires: php80-php-pear
+Requires: php80-php-process
+Requires: php80-php-snmp
+Requires: php80-php, php80-php-enchant , php80-php-pdo php80-php-tidy ,  php80-php-mysqlnd php80-php-pecl-zip
+
 %description
 Manage PHP FPM pools, and switch between PHP versions easily
 
@@ -228,6 +250,8 @@ Manage PHP FPM pools, and switch between
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
+%patch18 -p1
 
 %build
 perl createlinks
@@ -247,7 +271,7 @@ echo "[Install]" > root/usr/lib/systemd/
 echo "WantedBy=sme-server.target" > root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf
 
 %{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/
-for phpver in "55" "56" "70" "71" "72" "73" "74"; do
+for phpver in "55" "56" "70" "71" "72" "73" "74" "80"; do
 #needed folder
 %{__mkdir_p} root/var/log/php/php$phpver/
 %{__mkdir_p} root/var/lib/php/php$phpver/{session,tmp,opcache,wsdlcache}
@@ -286,7 +310,7 @@ find root/etc/e-smith/templates.metadata
 done
 
 # php7*
-for phpver in  "72" "73" "74"; do
+for phpver in  "72" "73" "74" "80"; do
 #cp ph70 metada
 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/
@@ -310,7 +334,7 @@ done
   --dir /var/lib/php/php/tmp 'attr(0770,root,www)' \
   --dir /var/lib/php/php/opcache 'attr(0770,root,www)' \
   --dir /var/lib/php/php/wsdlcache 'attr(0770,root,www)' \
-`for phpver in "54" "55" "56" "70" "71" "72" "73" "74"; do  echo -n "--dir /var/log/php/php$phpver attr(0770,root,www) --dir /var/lib/php/php$phpver/session attr(0770,root,www) --dir /var/lib/php/php$phpver/tmp attr(0770,root,www) --dir /var/lib/php/php$phpver/opcache attr(0770,root,www) --dir /var/lib/php/php$phpver/wsdlcache attr(0770,root,www) ";done `	\
+`for phpver in "54" "55" "56" "70" "71" "72" "73" "74" "80"; do  echo -n "--dir /var/log/php/php$phpver attr(0770,root,www) --dir /var/lib/php/php$phpver/session attr(0770,root,www) --dir /var/lib/php/php$phpver/tmp attr(0770,root,www) --dir /var/lib/php/php$phpver/opcache attr(0770,root,www) --dir /var/lib/php/php$phpver/wsdlcache attr(0770,root,www) ";done `	\
   > %{name}-%{version}-filelist
 
 
@@ -329,6 +353,10 @@ rm -rf $RPM_BUILD_ROOT
 %preun
 
 %changelog
+* Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-24.sme
+- allow php-pool-dirs to run from generik event [SME: 11287]
+- add php80 support [SME: 11295]
+
 * Wed Jan 27 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-23.sme
 - fix php55 logrotate [SME: 11325]
 - cleanup remove services in sme-server.target.wants [SME: 10956]