--- rpms/smeserver-freepbx/contribs10/smeserver-freepbx.spec	2022/03/28 03:13:09	1.5
+++ rpms/smeserver-freepbx/contribs10/smeserver-freepbx.spec	2022/05/31 04:17:50	1.10
@@ -1,10 +1,10 @@
-# $Id: smeserver-freepbx.spec,v 1.4 2022/03/27 20:13:44 jpp Exp $
+# $Id: smeserver-freepbx.spec,v 1.9 2022/04/17 02:17:11 jpp Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 #%define fpbxversion 2.5.0
-%define version	13
-%define release 17
+%define version	14
+%define release 3
 %define name smeserver-freepbx
 
 Summary: Asterisk web GUI
@@ -14,20 +14,9 @@ Release: %{release}%{?dist}
 License: GPL
 Group: System/Servers
 Source: %{name}-%{version}.tar.gz
-
-Patch0: smeserver-freepbx-13.bz9702.udpports.patch
-Patch1: smeserver-freepbx-13.bz9744.patch 
-Patch2: smeserver-freepbx-13.bz9702-2.patch
-Patch3: smeserver-freepbx-13.bz9760.patch
-Patch4: smeserver-freepbx-13.bz9918.defaultUDPports.patch
-Patch5: smeserver-freepbx-13.bz9860.AutoUpgradeModules.patch
-Patch6: smeserver-freepbx-13.bz9637.backupFBX.patch
-Patch7: smeserver-freepbx-13.bz10120.noiseAmportal.patch
-Patch8: smeserver-freepbx-13.bz10268.updatetktauth.patch
-Patch9: smeserver-freepbx-13.bz10496.missing-tampered-files.patch
-Patch10: smeserver-freepbx-13.bz10503.DeviceAndUser.patch
-#### start SME10 patch
-Patch11: smeserver-freepbx-bz11613-sme10.patch
+Patch0: smeserver-freepbx-14-bz11940-bz9756-cron.patch
+Patch1: smeserver-freepbx-14-bz11924-sounds.patch
+Patch2: smeserver-freepbx-14-bz11986-service-fwconsole.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 URL: http://www.freepbx.org/
@@ -40,7 +29,6 @@ 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
 # 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
@@ -85,6 +73,18 @@ This package provide the integration of
 
 
 %changelog
+* Tue May 31 2022 Jean-Philippe Pialasse <tests@pialasse.com> %{version}-3.sme
+- fix service file fwconsole path [SME: 11986]
+
+* Sat Apr 16 2022 Jean-Philippe Pialasse <tests@pialasse.com> %{version}-2.sme
+- fix huge amount of error if asterisk disabled [SME: 9756]
+- fix multiple email sent because of asterisk cron php path [SME: 11940]
+- on uninstall remove asterisk crontab to avoid noise [SME: 10131]
+- allow access to sounds folder for gui [SME: 11924]
+
+* Sun Mar 27 2022 Jean-Philippe Pialasse <tests@pialasse.com> 14-1.sme
+- first version 14 [SME: 11613]
+
 * 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] 
@@ -104,6 +104,7 @@ This package provide the integration of
 * Mon Jan 20 2020 Jean-Philipe Pialasse <tests@pialasse.com> 13-16.sme
 - add required modules to enable cel and cdr logging and search [SME: 10620]
 - add requires lame [SME: 9859]
+- fix sounds ownership so they can be handled via gui [SME: 11924]
 
 * Mon Jan 29 2018 Jean-Philipe Pialasse <tests@pialasse.com> 13-15.sme
 - fix warning tampered files in GUI [SME: 10496]
@@ -338,26 +339,10 @@ This package provide the integration of
 - initial release
 
 %prep
-
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-
-# 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
@@ -405,8 +390,15 @@ fi
 
 %preun
 if [ $1 = 0 ] ; then
-  /etc/rc.d/init.d/freepbx stop >& /dev/null || :
+  /usr/bin/systemctl stop  freepbx  >& /dev/null || :
 fi
-
 true
+%postun
+if [ $1 = 0 ] ; then
+   #remove cron for asterisk on uninstallation to avoid noise
+   /usr/bin/crontab -u asterisk -r  >& /dev/null || :
+fi
+true
+
+