SPECS: asterisk.spec - bristuff version uses special libpri-bristu...

[arekm]

Author: arekm                        Date: Mon Feb 11 09:02:53 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- bristuff version uses special libpri-bristuff.spec library

---- Files affected:
SPECS:
   asterisk.spec (1.108 -> 1.109) 

---- Diffs:

================================================================
Index: SPECS/asterisk.spec
diff -u SPECS/asterisk.spec:1.108 SPECS/asterisk.spec:1.109
--- SPECS/asterisk.spec:1.108	Sat Feb  9 15:15:34 2008
+++ SPECS/asterisk.spec	Mon Feb 11 10:02:48 2008
@@ -13,6 +13,7 @@
 %bcond_with	zhone 			# zhone hack
 %bcond_with	zhone_hack 		# huge hack workarounding broken zhone channel banks
 %bcond_with	bristuff		# BRIstuff (Junghanns.NET BRI adapters) support
+%bcond_with	verbose
 #
 %define _spandsp_version 0.0.2pre26
 #
@@ -47,6 +48,7 @@
 Patch13:	%{name}-zhone.patch
 # http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff
 Patch14:	%{name}-bristuff.patch
+Patch15:	%{name}-bristuff-libpri.patch
 URL:		http://www.asterisk.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -57,7 +59,6 @@
 BuildRequires:	gcc >= 5:3.4
 BuildRequires:	iksemel-devel
 BuildRequires:	imap-static
-BuildRequires:	libpri-devel >= 1.2.4
 BuildRequires:	mysql-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	openssl-devel >= 0.9.7d
@@ -73,7 +74,8 @@
 %if %{with bristuff}
 BuildRequires:	libgsmat-devel
 BuildRequires:	libpri-bristuff-devel >= 1.2.4
-Requires:	libpri-bristuff
+%else
+BuildRequires:  libpri-devel >= 1.2.4
 %endif
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
@@ -155,7 +157,10 @@
 
 %{?with_bluetooth:%patch12 -p1}
 %{?with_zhonehack:%patch13 -p1}
-%{?with_bristuff:%patch14 -p1}
+%if %{with bristuff}
+%patch14 -p1
+%patch15 -p1
+%endif
 
 sed -i -e "s#/usr/lib/#/usr/%{_lib}/#g#" Makefile
 
@@ -179,16 +184,19 @@
 cp -f .cleancount .lastclean
 
 %{__make} -j1 -C menuselect \
+	%{?with_verbose:NOISY_BUILD=yes} \
 	CC="%{__cc}" \
 	OPTIMIZE="%{rpmcflags}"
 
 %{__make} -j1 \
+	%{?with_verbose:NOISY_BUILD=yes} \
 	CC="%{__cc}" \
 	OPTIMIZE="%{rpmcflags}" \
 	CHANNEL_LIBS+=chan_bluetooth.so || :
 
 # rerun needed; asterisk want's that
 %{__make} -j1 \
+	%{?with_verbose:NOISY_BUILD=yes} \
 	CC="%{__cc}" \
 	OPTIMIZE="%{rpmcflags}" \
 	CHANNEL_LIBS+=chan_bluetooth.so
@@ -303,6 +311,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.109  2008-02-11 09:02:48  arekm
+- bristuff version uses special libpri-bristuff.spec library
+
 Revision 1.108  2008-02-09 14:15:34  arekm
 - enable gsmat
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/asterisk.spec?r1=1.108&r2=1.109&f=u