--- rpms/smeserver-freepbx/contribs7/smeserver-freepbx.spec	2009/10/06 11:34:19	1.14
+++ rpms/smeserver-freepbx/contribs7/smeserver-freepbx.spec	2011/10/13 16:09:43	1.22
@@ -1,10 +1,10 @@
-# $Id: smeserver-freepbx.spec,v 1.13 2009/10/06 11:25:53 vip-ire Exp $
+# $Id: smeserver-freepbx.spec,v 1.21 2011/01/05 14:46:04 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 #%define fpbxversion 2.5.0
 %define version	0.1
-%define release 22
+%define release 30
 %define name smeserver-freepbx
 
 Summary: Asterisk web GUI
@@ -40,6 +40,14 @@ Patch21: smeserver-freepbx-0.1-cdr_passw
 Patch22: smeserver-freepbx-0.1-fop_separate_service.patch
 Patch23: smeserver-freepbx-0.1-check_referer.patch
 Patch24: smeserver-freepbx-0.1-dump_astdb_include_functions.patch
+Patch25: smeserver-freepbx-0.1-disable_dynamic_hints.patch
+Patch26: smeserver-freepbx-0.1-remove_logrotate_conf.patch
+Patch27: smeserver-freepbx-0.1-ari_password_from_db.patch
+Patch28: smeserver-freepbx-0.1-create_mysql.patch
+Patch29: smeserver-freepbx-0.1-template_asterisk_conf.patch
+Patch30: smeserver-freepbx-0.1-datadir_in_var_lib.patch
+Patch31: smeserver-freepbx-0.1-templates_logrotate.patch
+Patch32: smeserver-freepbx-0.1-session_path.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 URL: http://www.freepbx.org/
@@ -50,8 +58,8 @@ BuildRequires:	tar
 Requires: mysql
 Requires: httpd
 Requires: php-pear
-Requires: asterisk
-Requires: asterisk-addons
+Requires: /usr/sbin/asterisk
+Requires: %{_libdir}/asterisk/modules/app_addon_sql_mysql.so
 Requires: dahdi-tools
 Requires: dahdi-linux
 Requires: sox
@@ -69,6 +77,34 @@ This package provide the integration of
 
 
 %changelog
+* Thu Oct 13 2011 Daniel B. <daniel@firewall-services.com> 0.1-30.sme
+- CHange session path [SME: 6661]
+
+* Wed Jan 05 2011 Daniel B. <daniel@firewall-services.com> 0.1-29.sme
+- astdatadir is /var/lib/asterisk
+- templates for /etc/logrotate.d/asterisk
+
+* Mon Sep 20 2010 Daniel B. <daniel@firewall-services.com> 0.1-28.sme
+- Create and populate the mysql databases in mysql.init
+- Templates for /etc/asterisk/asterisk.conf
+
+* Thu Jul 15 2010 Daniel B. <daniel@firewall-services.com> [0.1-27]
+- Read ARI password from the DB (and initialize a random one)
+
+* Mon Feb 22 2010 Daniel B. <daniel@firewall-services.com> [0.1-26]
+- Remove hard-coded dependencies on asterisk and asterisk-addons14
+  Depends now on asterisk binary and app_addon_sql_mysql.so files
+  (so it can work with asterisk or asterisk14)
+
+* Mon Feb 15 2010 Daniel B. <daniel@firewall-services.com> [0.1-25]
+- Remove /etc/logrotate.d/asterisk which is now included in asterisk14
+
+* Tue Feb 09 2010 Daniel B. <daniel@firewall-services.com> [0.1-24]
+- Depends now on asterisk14 and asterisk-addons14
+
+* Wed Jan 06 2010 Daniel B. <daniel@firewall-services.com> [0.1-23]
+- disable dynamic hints
+
 * Tue Oct 06 2009 Daniel B. <daniel@firewall-services.com> [0.1-22]
 - include /opt/freepbx/admin/functions.inc.php in freepbx-dump-astdb
   action script for FreePBX 2.6 compatibility
@@ -182,6 +218,14 @@ This package provide the integration of
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
 
 %build
 # Build symlinks
@@ -190,6 +234,9 @@ perl createlinks
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+%{__mkdir_p} $RPM_BUILD_ROOT/var/lib/php/fpbx-session
+
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
 	--file /usr/share/freepbx/scripts/uninstall.sh 'attr(0750,root,root)' \
@@ -203,6 +250,7 @@ rm -rf $RPM_BUILD_ROOT
 	--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 /etc/logrotate.d/asterisk 'config(noreplace)' \
+        --dir /var/lib/php/fpbx-session 'attr(0770,root,asterisk)' \
 	 > %{name}-%{version}-%{release}-filelist
 
 %clean