rpms/openpbx/devel .cvsignore, 1.2, 1.3 openpbx.spec, 1.2, 1.3 sources, 1.2, 1.3

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/extras/rpms/openpbx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24272

Modified Files:
	.cvsignore openpbx.spec sources 
Log Message:
build with mISDN and MySQL


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Oct 2006 06:43:10 -0000	1.2
+++ .cvsignore	18 Oct 2006 16:17:46 -0000	1.3
@@ -1 +1 @@
-openpbx-r1979.tar.gz
+openpbx-r1984.tar.gz


Index: openpbx.spec
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/openpbx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openpbx.spec	17 Oct 2006 12:43:14 -0000	1.2
+++ openpbx.spec	18 Oct 2006 16:17:46 -0000	1.3
@@ -1,13 +1,13 @@
-%define snap 1979
+%define snap 1984
 
-%bcond_with misdn
+%bcond_without misdn
 %bcond_without zaptel
 
 %bcond_without	fedora
 
 Name:		openpbx
 Version:	1.2
-Release:	1.rc1.svn%{snap}%{?dist}
+Release:	2.rc1.svn%{snap}%{?dist}
 Summary:	The Truly Open Source PBX
 
 Group:		Applications/Internet
@@ -23,7 +23,7 @@
 BuildRequires:	fedora-usermgmt-devel bluez-libs-devel openldap-devel
 BuildRequires:	libjpeg-devel loudmouth-devel nspr-devel js-devel ncurses-devel
 BuildRequires:	unixODBC-devel openssl-devel speex-devel alsa-lib-devel
-BuildRequires:	isdn4k-utils-devel libcap-devel sqlite-devel
+BuildRequires:	isdn4k-utils-devel libcap-devel sqlite-devel mysql-devel
 BuildRequires:	postgresql-devel libedit-devel %{?with_misdn:mISDN-devel}
 BuildRequires:	popt %{?with_zaptel:zaptel-devel libpri-devel}
 
@@ -60,6 +60,14 @@
 %description postgresql
 This package contains modules for OpenPBX which make use of PostgreSQL.
 
+%package mysql
+Group:		Applications/Internet
+Summary:	MySQL support for OpenPBX
+Requires:	%{name} = %{version}-%{release}
+
+%description mysql
+This package contains modules for OpenPBX which make use of MySQL.
+
 %package odbc
 Group:		Applications/Internet
 Summary:	ODBC support for OpenPBX
@@ -167,7 +175,9 @@
 	   --enable-javascript --with-res_js --enable-fast-install \
 	   %{?with_misdn:--with-chan_misdn} \
 	   %{?with_zaptel:--enable-zaptel} \
-	   --enable-jabber --with-res_jabber # --with-res_sqlite
+	   --enable-jabber --with-res_jabber \
+	   --enable-mysql --with-res_config_mysql --with-cdr_mysql
+	   
 
 # Poxy fscking libtool is _such_ a pile of crap...
 sed -i 's/^CC="gcc"/CC="gcc -Wl,--as-needed"/' libtool
@@ -247,6 +257,7 @@
 %exclude %{_sysconfdir}/openpbx.org/cdr_tds.conf
 # Separately packaged
 %exclude %{_libdir}/openpbx.org/modules/*pgsql.so
+%exclude %{_libdir}/openpbx.org/modules/*mysql.so
 %exclude %{_libdir}/openpbx.org/modules/app_sql_postgres.so
 %exclude %{_libdir}/openpbx.org/modules/app_ldap.so
 %exclude %{_libdir}/openpbx.org/modules/cdr_odbc.so
@@ -257,6 +268,7 @@
 %exclude %{_libdir}/openpbx.org/modules/res_ogi.so
 %exclude %{_libdir}/openpbx.org/modules/chan_capi.so
 %exclude %{_sysconfdir}/openpbx.org/cdr_pgsql.conf
+%exclude %{_sysconfdir}/openpbx.org/*mysql.conf
 %exclude %{_sysconfdir}/openpbx.org/cdr_odbc.conf
 %exclude %{_sysconfdir}/openpbx.org/chan_bluetooth.conf
 %exclude %{_sysconfdir}/openpbx.org/res_jabber.conf
@@ -285,6 +297,10 @@
 %{_libdir}/openpbx.org/modules/app_sql_postgres.so
 %config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/cdr_pgsql.conf
 
+%files mysql
+%{_libdir}/openpbx.org/modules/*mysql.so
+%config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/*mysql.conf
+
 %files odbc
 %{_libdir}/openpbx.org/modules/cdr_odbc.so
 %config(noreplace) %attr(0644,openpbx,openpbx) %{_sysconfdir}/openpbx.org/cdr_odbc.conf
@@ -337,5 +353,8 @@
 %{_sbindir}/eogi*
 
 %changelog
+* Wed Oct 18 2006 David Woodhouse <dwmw2 at infradead.org> 1.2-2.rc1.svn1984
+- Build with mISDN and MySQL support
+
 * Thu Oct  5 2006 David Woodhouse <dwmw2 at infradead.org> 1.2-1.rc1.svn1979
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openpbx/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Oct 2006 06:43:10 -0000	1.2
+++ sources	18 Oct 2006 16:17:46 -0000	1.3
@@ -1 +1 @@
-b863cbd1e90338b05439267be3eccb44  openpbx-r1979.tar.gz
+8aed2d6afedbd13082d8ce4318b8f163  openpbx-r1984.tar.gz