packages: asterisk/asterisk.spec - fix against broken patch uncriticaly tak...

zbyniu zbyniu at pld-linux.org
Tue Jul 27 22:39:00 CEST 2010


Author: zbyniu                       Date: Tue Jul 27 20:39:00 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix against broken patch uncriticaly taken from fedora; rel 2

---- Files affected:
packages/asterisk:
   asterisk.spec (1.177 -> 1.178) 

---- Diffs:

================================================================
Index: packages/asterisk/asterisk.spec
diff -u packages/asterisk/asterisk.spec:1.177 packages/asterisk/asterisk.spec:1.178
--- packages/asterisk/asterisk.spec:1.177	Tue Jul 27 21:36:48 2010
+++ packages/asterisk/asterisk.spec	Tue Jul 27 22:38:55 2010
@@ -4,7 +4,6 @@
 # - use shared versions of LIBILBC:=ilbc/libilbc.a (ilbc not enabled currently)
 # - CFLAGS passing
 # - fix bluetooth patch
-# - ~/.asterisk_history gets encoded with \xxx on exit, each time yet again
 # - make package for moh sound files
 # - likely odbc and imap broken (identical code, some #define not working, etc):
 #   *** WARNING: identical binaries are copied, not linked:
@@ -32,7 +31,7 @@
 %bcond_without	verbose		# verbose build
 
 %define		spandsp_version 0.0.2pre26
-%define		rel	1
+%define		rel	2
 Summary:	Asterisk PBX
 Summary(pl.UTF-8):	Centralka (PBX) Asterisk
 Name:		asterisk
@@ -69,6 +68,7 @@
 Patch15:	%{name}-bristuff-libpri.patch
 Patch16:	lpc10-system.patch
 Patch17:	gsm-libpoison.patch
+Patch18:	Fix-history-loading-when-using-external-libedit.patch
 URL:		http://www.asterisk.org/
 BuildRequires:	OSPToolkit-devel
 BuildRequires:	SDL_image-devel
@@ -553,6 +553,7 @@
 %endif
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 # Fixup makefile so sound archives aren't downloaded/installed
 %{__sed} -i -e 's/^all:.*$/all:/' sounds/Makefile
@@ -1296,6 +1297,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.178  2010/07/27 20:38:55  zbyniu
+- fix against broken patch uncriticaly taken from fedora; rel 2
+
 Revision 1.177  2010/07/27 19:36:48  glen
 - restore todo (removed in r1.175), the problem is not fixed
 
================================================================

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



More information about the pld-cvs-commit mailing list