--- rpms/smeserver-freepbx/contribs7/smeserver-freepbx.spec	2009/04/16 07:48:24	1.10
+++ rpms/smeserver-freepbx/contribs7/smeserver-freepbx.spec	2009/04/28 14:04:54	1.11
@@ -1,10 +1,10 @@
-# $Id: smeserver-freepbx.spec,v 1.9 2009/04/10 23:29:40 vip-ire Exp $
+# $Id: smeserver-freepbx.spec,v 1.10 2009/04/16 07:48:24 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 #%define fpbxversion 2.5.0
 %define version	0.1
-%define release 19
+%define release 20
 %define name smeserver-freepbx
 
 Summary: Asterisk web GUI
@@ -36,6 +36,8 @@ Patch17: smeserver-freepbx-0.1-cdr_mysql
 Patch18: smeserver-freepbx-0.1-clean_crontab.patch
 Patch19: smeserver-freepbx-0.1-crontab_script_fixe.patch
 Patch20: smeserver-freepbx-0.1-http_cleanup.patch
+Patch21: smeserver-freepbx-0.1-cdr_passwd.patch
+Patch22: smeserver-freepbx-0.1-fop_separate_service.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 URL: http://www.freepbx.org/
@@ -65,6 +67,10 @@ This package provide the integration of
 
 
 %changelog
+* Tue Apr 28 2009 Daniel B. <daniel@firewall-services.com> [0.1-20]
+- Fix CDR db password in cdr_mysql.conf template
+- Use a separate service in SME db for FOP
+
 * Thu Apr 16 2009 Daniel B. <daniel@firewall-services.com> [0.1-19]
 - remove scoreboard directive from httpd-fpbx config
 - remove some modules (mod_ssl, mod_proxy)
@@ -162,6 +168,8 @@ This package provide the integration of
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
+%patch22 -p1
 
 %build
 # Build symlinks