--- rpms/smeserver-freepbx/contribs7/smeserver-freepbx.spec	2009/10/06 11:34:19	1.14
+++ rpms/smeserver-freepbx/contribs7/smeserver-freepbx.spec	2010/02/22 16:44:41	1.18
@@ -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.17 2010/02/15 08:09:53 vip-ire Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 #%define fpbxversion 2.5.0
 %define version	0.1
-%define release 22
+%define release 26
 %define name smeserver-freepbx
 
 Summary: Asterisk web GUI
@@ -40,6 +40,8 @@ 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
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 URL: http://www.freepbx.org/
@@ -50,8 +52,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 +71,20 @@ This package provide the integration of
 
 
 %changelog
+* 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 +198,8 @@ This package provide the integration of
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
+%patch26 -p1
 
 %build
 # Build symlinks