[packages/asterisk] - remove, broken and unneeded with ptlib, p[wt]lib version check - fix files listing
baggins
baggins at pld-linux.org
Sun Nov 18 11:34:29 CET 2012
commit fba8507d9ca35f72d73740e6ae671425e4857b1a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Nov 18 11:33:22 2012 +0100
- remove, broken and unneeded with ptlib, p[wt]lib version check
- fix files listing
asterisk.spec | 7 ++-----
ptlib-check.patch | 11 +++++++++++
2 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/asterisk.spec b/asterisk.spec
index f25fc1f..d7e9853 100644
--- 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
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()
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/52701e7da46d1eaeb7ed3dd87628fd24fb0178cb
More information about the pld-cvs-commit
mailing list