- remove, broken and unneeded with ptlib, p[wt]lib version check

- fix files listing

diff --git a/asterisk.spec b/asterisk.spec
index f25fc1fe00114da610bc090c192ccac2cb44d2c2..d7e98530cdb314e98c0422ba22defe92110b682c 100644 (file)
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -73,6 +73,7 @@ Patch15:      %{name}-bristuff-libpri.patch
 Patch16:       lpc10-system.patch
 Patch17:       gsm-libpoison.patch
 Patch18:       Fix-history-loading-when-using-external-libedit.patch
+Patch19:       ptlib-check.patch
 URL:           http://www.asterisk.org/
 BuildRequires: OSPToolkit-devel >= 3.6.1
 BuildRequires: SDL_image-devel
@@ -569,6 +570,7 @@ cp %{SOURCE11} .
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
 # Fixup makefile so sound archives aren't downloaded/installed
 %{__sed} -i -e 's/^all:.*$/all:/' sounds/Makefile
@@ -942,7 +944,6 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(755,root,root) %{_libdir}/asterisk/modules/cdr_syslog.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/cel_custom.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/cel_manager.so
-%attr(755,root,root) %{_libdir}/asterisk/modules/cel_odbc.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_agent.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_bridge.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_iax2.so
@@ -1137,10 +1138,6 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(755,root,root) %{_libdir}/asterisk/modules/codec_dahdi.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_timing_dahdi.so
 
-%dir %{_includedir}/asterisk
-%{_includedir}/asterisk.h
-%{_includedir}/asterisk/*.h
-
 %files fax
 %defattr(644,root,root,755)
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_fax.conf

diff --git a/ptlib-check.patch b/ptlib-check.patch
new file mode 100644 (file)
index 0000000..710ae09
--- /dev/null
+++ b/ptlib-check.patch
@@ -0,0 +1,11 @@
+--- asterisk-10.0.1/configure.ac~      2012-11-18 11:14:49.723296429 +0100
++++ asterisk-10.0.1/configure.ac       2012-11-18 11:21:06.196616485 +0100
+@@ -1978,8 +1978,6 @@
+               PWLIBDIR="${PWLIB_DIR}"
+       fi
+       AST_CHECK_PWLIB()
+-      AST_CHECK_PWLIB_VERSION([PWLib], [PWLIB], [ptbuildopts.h], [1], [9], [2], [P[[WT]]LIB_VERSION])
+-              
+       if test "${HAS_PWLIB:-unset}" != "unset"; then
+               AST_CHECK_PWLIB_PLATFORM()
+