--- rpms/smeserver-freepbx/contribs7/smeserver-freepbx.spec	2009/03/02 17:31:24	1.1
+++ rpms/smeserver-freepbx/contribs7/smeserver-freepbx.spec	2009/03/23 09:45:57	1.7
@@ -1,47 +1,54 @@
+# $Id: smeserver-freepbx.spec,v 1.6 2009/03/19 10:21:03 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
-
 #%define fpbxversion 2.5.0
 %define version	0.1
-%define release 9
+%define release 16
 %define name smeserver-freepbx
 
+Summary: Asterisk web GUI
+Name: %{name}
+Version: %{version}
+Release: %{release}%{?dist}
+License: GPL
+Group: System/Servers
+Source: %{name}-%{version}.tar.gz
+
+Patch0:	smeserver-freepbx-0.1-fop_link.patch
+Patch1:	smeserver-freepbx-0.1-genzaptelconf.patch
+Patch2:	smeserver-freepbx-0.1-logrotate.patch
+Patch3:	smeserver-freepbx-0.1-asterisk_logrotate.patch
+Patch4:	smeserver-freepbx-0.1-userpanels.patch
+Patch5:	smeserver-freepbx-0.1-trunk_alert_mail.patch
+Patch6:	smeserver-freepbx-0.1-trunk_name_in_alert.patch
+Patch7: smeserver-freepbx-0.1-postupgrade_to_bootstrap.patch
+Patch8: smeserver-freepbx-0.1-zap2dahdi.patch
+Patch9: smeserver-freepbx-0.1-full_dahdi_support.patch
+Patch10: smeserver-freepbx-0.1-fix_logrotate_event.patch
+Patch11: smeserver-freepbx-0.1-retry_install.patch
+Patch12: smeserver-freepbx-0.1-recordings_security.patch
 
-Summary:	Asterisk web GUI
-Name:		%{name}
-Version:	%{version}
-Release:    	%{release}%{?dist}
-License:    	GPL
-Group:		System/Servers
-Source:		%{name}-%{version}.tar.gz
-Patch0:		smeserver-freepbx-0.1-fop_link.patch
-Patch1:		smeserver-freepbx-0.1-genzaptelconf.patch
-Patch2:		smeserver-freepbx-0.1-logrotate.patch
-Patch3:		smeserver-freepbx-0.1-asterisk_logrotate.patch
-Patch4:		smeserver-freepbx-0.1-userpanels.patch
-Patch5:		smeserver-freepbx-0.1-trunk_alert_mail.patch
-Patch6:		smeserver-freepbx-0.1-trunk_name_in_alert.patch
-Patch7:		smeserver-freepbx-0.1-postupgrade_to_bootstrap.patch
-BuildRoot:	/var/tmp/%{name}-%{version}-%{release}-buildroot
-URL:		http://www.freepbx.org/
+BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
+URL: http://www.freepbx.org/
 
 BuildRequires:	e-smith-devtools
 BuildRequires:	tar
 
-Requires:	mysql
-Requires:	httpd
-Requires:	php-pear
-Requires:	asterisk
-Requires:	asterisk-addons
-Requires:	zaptel
-Requires:	speex
-Requires:	sox
-Requires:	mod_auth_tkt
-Requires:	e-smith-base
-Requires:	freepbx-src
-Buildarch:	noarch
-AutoReqProv: 	no
+Requires: mysql
+Requires: httpd
+Requires: php-pear
+Requires: asterisk
+Requires: asterisk-addons
+Requires: dahdi-tools
+Requires: dahdi-linux
+Requires: sox
+Requires: mod_auth_tkt
+Requires: e-smith-base
+Requires: freepbx-src
+
+Buildarch: noarch
+AutoReqProv: no
 
 
 %description
@@ -50,6 +57,28 @@ This package provide the integration of
 
 
 %changelog
+* Mon Mar 23 2009 Daniel B. <daniel@firewall-services.com> [0.1-16]
+- Security Fixe: put a random password for ARI admin (this should be documented)
+
+* Thu Mar 19 2009 Daniel B. <daniel@firewall-services.com> [0.1-15]
+- Check if /opt/freepbx/admin exists (retry the install if a first one failed)
+- Remove tabs from spec
+
+* Wed Mar 18 2009 Daniel B. <daniel@firewall-services.com> [0.1-14]
+- Remove speex from dependencies
+
+* Thu Mar 12 2009 Daniel B. <daniel@firewall-services.com> [0.1-13]
+- Remove zaptel dependency, replaced with dahdi-tools and dahdi-linux
+
+* Mon Feb 23 2009 Daniel B. <daniel@firewall-services.com> [0.1-12]
+- Fix logrotate issue (send a sigusr1 signal to httpd-fpbx)
+
+* Thu Feb 12 2009 Daniel B. <daniel@firewall-services.com> [0.1-11]
+- Full support for the new DAHDI driver, droping zaptel
+
+* Mon Feb 09 2009 Daniel B. <daniel@firewall-services.com> [0.1-10]
+- add support for DAHDI channel
+
 * Mon Dec 08 2008 Daniel B. <daniel@firewall-services.com> [0.1-9]
 - move expand-templates from post-upgrade event to bootstrap-console-save
 
@@ -98,6 +127,11 @@ This package provide the integration of
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 # Build symlinks