--- rpms/smeserver-freepbx/contribs10/smeserver-freepbx.spec	2022/03/25 04:44:48	1.3
+++ rpms/smeserver-freepbx/contribs10/smeserver-freepbx.spec	2022/03/27 20:13:44	1.4
@@ -1,4 +1,4 @@
-# $Id: smeserver-freepbx.spec,v 1.2 2021/11/11 04:56:32 jpp Exp $
+# $Id: smeserver-freepbx.spec,v 1.3 2022/03/25 04:44:48 jpp Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
@@ -38,7 +38,10 @@ BuildRequires:	tar
 Requires: mariadb
 Requires: nodejs >= 10
 #Requires: php-pear php-cgi php-common php-curl php-mbstring php-gd php-mysql php-gettext php-bcmath php-zip php-xml php-imap php-json php-process php-snmp
-Requires: php74-php-pear php74-php-cgi php74-php-common php74-php-curl php74-php-mbstring php74-php-gd php74-php-mysql php74-php-gettext php74-php-bcmath php74-php-zip php74-php-xml php74-php-imap php74-php-json php74-php-process php74-php-snmp
+# freepbx 14 requires php56
+Requires: php56-php-pear php56-php-cgi php56-php-common php56-php-curl php56-php-mbstring php56-php-gd php56-php-mysql php56-php-gettext php56-php-bcmath php56-php-zip php56-php-xml php56-php-imap php56-php-json php56-php-process php56-php-snmp
+#Requires: php70-php-pear php70-php-cgi php70-php-common php70-php-curl php70-php-mbstring php70-php-gd php70-php-mysql php70-php-gettext php70-php-bcmath php70-php-zip php70-php-xml php70-php-imap php70-php-json php70-php-process php70-php-snmp
+#Requires: php74-php-pear php74-php-cgi php74-php-common php74-php-curl php74-php-mbstring php74-php-gd php74-php-mysql php74-php-gettext php74-php-bcmath php74-php-zip php74-php-xml php74-php-imap php74-php-json php74-php-process php74-php-snmp
 Requires: httpd
 Requires: php-pear
 Requires: /usr/sbin/asterisk
@@ -64,6 +67,13 @@ Requires: unixODBC
 Requires: asterisk-odbc
 Requires: lame
 Requires: xz
+Requires: asterisk-ael asterisk-iax2 asterisk-fax asterisk-ldap asterisk-misdn
+Requires: MySQL-python opus nmap icu vsftpd libicu-devel gcc-c++
+Requires: asterisk-moh-opsound-alaw asterisk-moh-opsound-g722 asterisk-moh-opsound-g729 asterisk-moh-opsound-gsm asterisk-moh-opsound-siren14 asterisk-moh-opsound-siren7 asterisk-moh-opsound-sln16 asterisk-moh-opsound-ulaw asterisk-moh-opsound-wav
+Requires: asterisk-sounds-core-en-alaw asterisk-sounds-core-en-g722 asterisk-sounds-core-en-g729 asterisk-sounds-core-en-gsm asterisk-sounds-core-en-siren14 asterisk-sounds-core-en-siren7 asterisk-sounds-core-en-sln16 asterisk-sounds-core-en-ulaw asterisk-sounds-core-en-wav
+# Requires: asterisk-sounds-core-fr-alaw asterisk-sounds-core-fr-g722 asterisk-sounds-core-fr-g729 asterisk-sounds-core-fr-gsm asterisk-sounds-core-fr-siren14 asterisk-sounds-core-fr-siren7 asterisk-sounds-core-fr-sln16 asterisk-sounds-core-fr-ulaw asterisk-sounds-core-fr-wav
+# Requires:  asterisk-sounds-core-it-alaw asterisk-sounds-core-it-g722 asterisk-sounds-core-it-g729 asterisk-sounds-core-it-gsm asterisk-sounds-core-it-siren14 asterisk-sounds-core-it-siren7 asterisk-sounds-core-it-sln16 asterisk-sounds-core-it-ulaw asterisk-sounds-core-it-wav
+# Requires: asterisk-sounds-core-es-alaw asterisk-sounds-core-es-g722 asterisk-sounds-core-es-g729 asterisk-sounds-core-es-gsm asterisk-sounds-core-es-siren14 asterisk-sounds-core-es-siren7 asterisk-sounds-core-es-sln16 asterisk-sounds-core-es-ulaw asterisk-sounds-core-es-wav
 
 #Buildarch: noarch
 AutoReqProv: no
@@ -78,15 +88,15 @@ This package provide the integration of
 * Wed Nov 10 2021 Jean-Philippe Pialasse <tests@pialasse.com> 13-17.sme
 - first import to SME10 [SME: 11613]
 - make it Freepbx 14 compatible [SME: 10705] 
-  add dependencies for SME10 mariadb nodejs >= 10 php74*
+  add dependencies for SME10 mariadb nodejs >= 10 php70*
   remove missing rpms asterisk-sounds-extra-en-ulaw asterisk-resample asterisk-addons
   remove double owned folders /etc/asterisk /var/lib/asterisk
   systemd ready for asterisk(disabled), freepbx, httpd-fpbx
   smeserver-freepbx-update event created NEED TEST
-  php74-php-fpm fragment 
+  php70-php-fpm fragment 
   update httpd-fpbx template for php-fpm use
   TODO : update httpd-e-smith to use php-fpm for fpbx
-  TODO : update install script for php74 
+  update install script for php74 
   add a copy of safe_asterisk
   TODO : create php folders and set rights
   improve logrotate
@@ -344,7 +354,10 @@ This package provide the integration of
 
 # until rebuilt of a smeserver-freepbx tar file:
 rm -rf root/etc/e-smith/db/configuration/defaults/freepbx/DeviceAndUser
+rm -rf root/var/log/httpd-fpbx
 %patch11 -p1
+mkdir -p  root/var/log/php/freepbx
+mkdir -p  root/var/lib/php/freepbx/sessions root/var/lib/php/freepbx/temp
 
 %build
 # Build symlinks
@@ -364,12 +377,14 @@ rm -rf $RPM_BUILD_ROOT
 	--dir /var/service/httpd-fpbx/log 'attr(0755,root,root)' \
 	--file /var/service/httpd-fpbx/log/run 'attr(0755,root,root)' \
 	--dir /var/service/httpd-fpbx/log/supervise 'attr(0700,root,root)' \
-	--dir /var/log/httpd-fpbx 'attr(0750,smelog,smelog)' \
 	--file /var/lib/asterisk/bin/genzaptelconf 'attr(0750,root,root)' \
-	--file /var/lib/asterisk/agi-bin/trunk_alert_mail.agi 'attr(0750,asterisk,asterisk)' \
+	--file /usr/share/asterisk/agi-bin/trunk_alert_mail.agi 'attr(0750,asterisk,asterisk)' \
 	--file /etc/logrotate.d/asterisk 'config(noreplace)' \
         --dir /var/lib/php/fpbx-session 'attr(0770,root,asterisk)' \
-	--file /usr/local/bin/safe_asterisk  'attr(0755,root,root)' \
+	--file /usr/sbin/safe_asterisk  'attr(0755,root,root)' \
+        --dir /var/log/php/freepbx 'attr(0770,root,asterisk)' \
+	--dir /var/lib/php/freepbx/sessions 'attr(0770,root,asterisk)' \
+        --dir /var/lib/php/freepbx/temp 'attr(0770,root,asterisk)' \
 |grep -v '/var/lib/asterisk$'| grep -v '/etc/asterisk$' \
 	 > %{name}-%{version}-%{release}-filelist