--- rpms/smeserver-freepbx/contribs10/smeserver-freepbx.spec	2023/02/05 16:43:05	1.24
+++ rpms/smeserver-freepbx/contribs10/smeserver-freepbx.spec	2024/04/23 03:25:29	1.27
@@ -1,10 +1,10 @@
-# $Id: smeserver-freepbx.spec,v 1.23 2023/01/04 05:25:17 jpp Exp $
+# $Id: smeserver-freepbx.spec,v 1.26 2024/04/23 03:09:23 jpp Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 #%define fpbxversion 2.5.0
 %define version	14
-%define release 13
+%define release 14
 %define name smeserver-freepbx
 
 Summary: Asterisk web GUI
@@ -23,6 +23,7 @@ Patch5: smeserver-freepbx-14-bz12226.pat
 Patch6: smeserver-freepbx-14-bz10703-backup.patch
 Patch7: smeserver-freepbx-14-bz11923-bz12256.patch
 Patch8: smeserver-freepbx-14-go15.patch
+Patch9: smeserver-freepbx-14-bz12481-bz12506.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 URL: http://www.freepbx.org/
@@ -82,7 +83,11 @@ This package provide the integration of
 
 
 %changelog
-* Wed Jan 04 2023 Jean-Philippe Pialasse <tests@pialasse.com> 14-12.sme
+* Mon Apr 22 2024 Jean-Philippe Pialasse <jpp@koozali.org> 14-14.sme
+- some logs not rotated [SME: 12506]
+- moving freepbx php error log from /var/log/php [SME: 12481]
+
+* Wed Jan 04 2023 Jean-Philippe Pialasse <tests@pialasse.com> 14-13.sme
 - fix permission denied on /usr/local/sbin/fwconsole from cron 
 
 * Wed Dec 14 2022 Jean-Philippe Pialasse <tests@pialasse.com> 14-11.sme
@@ -392,6 +397,8 @@ This package provide the integration of
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+rm root/var/log/php
 
 %build
 # Build symlinks
@@ -401,6 +408,7 @@ perl createlinks
 rm -rf $RPM_BUILD_ROOT
 
 %{__mkdir_p} $RPM_BUILD_ROOT/var/lib/php/fpbx-session
+%{__mkdir_p} $RPM_BUILD_ROOT/var/log/freepbx
 
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
@@ -417,7 +425,7 @@ rm -rf $RPM_BUILD_ROOT
 	--file /etc/logrotate.d/asterisk 'config(noreplace)' \
         --dir /var/lib/php/fpbx-session 'attr(0770,root,asterisk)' \
 	--file /usr/sbin/safe_asterisk  'attr(0755,root,root)' \
-        --dir /var/log/php/freepbx 'attr(0770,root,asterisk)' \
+        --dir /var/log/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$' \
@@ -437,6 +445,9 @@ if [ `stat -c %U /tmp` == "asterisk"  ];
         chmod o+rwxt /tmp/
         chown root:root /tmp/
 fi
+if [ -f /var/log/php/freepbx/error.log ]; then
+	mv /var/log/php/freepbx/* /var/log/freepbx/  >& /dev/null || :
+fi
 
 %preun
 if [ $1 = 0 ] ; then