packages: asterisk/asterisk.spec, asterisk/asterisk-configure.patch (REMOVE...

[glen]

Author: glen                         Date: Tue Dec 29 19:17:05 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- remove/update outdated patches
- requires_eq removed, readd if soname dep is not sufficent (h323 dep was even bogus and so is pwlib due it)

---- Files affected:
packages/asterisk:
   asterisk.spec (1.143 -> 1.144) , asterisk-configure.patch (1.3 -> NONE)  (REMOVED), asterisk-m4.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/asterisk/asterisk.spec
diff -u packages/asterisk/asterisk.spec:1.143 packages/asterisk/asterisk.spec:1.144
--- packages/asterisk/asterisk.spec:1.143	Tue Dec 29 18:22:46 2009
+++ packages/asterisk/asterisk.spec	Tue Dec 29 20:17:00 2009
@@ -7,6 +7,8 @@
 # - fix bluetooth patch
 # - package commandline tools (aelparse etc.)
 # - system mxml
+# - ~/.asterisk_history gets encoded with \xxx on exit, each time yet again
+# - openh323 is missing regardless of BR, see http://pld.pastebin.com/f7f84c312
 #
 # Conditional build:
 %bcond_with	rxfax		# without rx (also tx :-D) fax
@@ -18,7 +20,7 @@
 %bcond_with	verbose		# verbose build
 
 %define		spandsp_version 0.0.2pre26
-%define		rel	0.3
+%define		rel	0.4
 Summary:	Asterisk PBX
 Summary(pl.UTF-8):	Centralka (PBX) Asterisk
 Name:		asterisk
@@ -39,8 +41,6 @@
 # Source10-md5:	8c8fcb263b76897022b4c28052a7b439
 Source11:	http://soft-switch.org/downloads/spandsp/spandsp-%{spandsp_version}/asterisk-1.2.x/app_rxfax.c
 # Source11-md5:	ab6983b51c412883545b36993d704999
-Patch0:		%{name}-m4.patch
-Patch1:		%{name}-configure.patch
 Patch2:		%{name}-no_k6_on_sparc.patch
 Patch3:		%{name}-lib.patch
 Patch4:		%{name}-ppc.patch
@@ -49,7 +49,6 @@
 Patch7:		FHS-paths.patch
 # http://soft-switch.org/downloads/spandsp/spandsp-%{spandsp_version}/asterisk-1.2.x/apps_Makefile.patch
 Patch10:	%{name}-txfax-Makefile.patch
-Patch11:	%{name}-fix-ptlib.patch
 Patch12:	%{name}-chan_bluetooth.patch
 Patch13:	%{name}-zhone.patch
 # http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff
@@ -75,6 +74,7 @@
 BuildRequires:	imap-devel
 BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:	libcap-devel
+BuildRequires:	libedit-devel
 BuildRequires:	libogg-devel
 BuildRequires:	libvorbis-devel
 BuildRequires:	mISDNuser-devel
@@ -111,8 +111,6 @@
 %endif
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
-%requires_eq	openh323
-%requires_eq	pwlib
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -165,18 +163,17 @@
 
 %prep
 %setup -q
-
-%{?with_zhone:sed -i -e 's|.*#define.*ZHONE_HACK.*|#define ZHONE_HACK 1|g' channels/chan_zap.c}
-
-#%patch0 -p0
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
+%patch2 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p0
 %patch6 -p0
 %patch7 -p0
 
+%if %{with zhone}
+sed -i -e 's|.*#define.*ZHONE_HACK.*|#define ZHONE_HACK 1|g' channels/chan_zap.c
+%endif
+
 %if %{with rxfax}
 cd apps
 %patch10 -p0
@@ -184,26 +181,17 @@
 cp %{SOURCE11} .
 %endif
 
-#%patch11 -p1
-
 %{?with_bluetooth:%patch12 -p1}
 %{?with_zhonehack:%patch13 -p1}
+
 %if %{with bristuff}
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
 %endif
 
-sed -i -e "s#/usr/lib/#/usr/%{_lib}/#g#" Makefile
-
-%if 0
-mkdir -p imap/c-client
-ln -s %{_libdir}/libc-client.a imap/c-client/c-client.a
-ln -s %{_includedir}/imap/* imap/c-client/
-echo '-lssl -lpam' > imap/c-client/LDFLAGS
-%else
+# avoid using it
 rm -rf imap
-%endif
 
 %build
 rm -f pbx/.depend
@@ -392,6 +380,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.144  2009/12/29 19:17:00  glen
+- remove/update outdated patches
+- requires_eq removed, readd if soname dep is not sufficent (h323 dep was even bogus and so is pwlib due it)
+
 Revision 1.143  2009/12/29 17:22:46  glen
 - run configure our own to catch cflags
 - system imap and libedit
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/asterisk.spec?r1=1.143&r2=1.144&f=u