rpms/asterisk/devel asterisk.spec,1.26,1.27

Jeffrey C. Ollie (jcollie) fedora-extras-commits at redhat.com
Thu Jun 12 17:20:07 UTC 2008


Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14553

Modified Files:
	asterisk.spec 
Log Message:
* Thu Jun 12 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0-0.16.beta9
- Disable building cdr_tds since new FreeTDS in rawhide no longer provides needed library.



Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- asterisk.spec	11 Jun 2008 11:30:24 -0000	1.26
+++ asterisk.spec	12 Jun 2008 17:19:20 -0000	1.27
@@ -1,10 +1,11 @@
 %define with_apidoc %{?_with_apidoc: 1} %{!?_with_apidoc: 0}
+%define with_freetds %{?_with_freetds: 1} %{!?_with_freetds: 0}
 %define beta 9
 
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.0
-Release: 0.15.beta%{beta}%{?dist}
+Release: 0.16.beta%{beta}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -313,6 +314,7 @@
 %description sqlite
 Sqlite modules for Asterisk.
 
+%if %{with_freetds}
 %package tds
 Summary: Modules for Asterisk that use FreeTDS
 Group: Applications/Internet
@@ -321,6 +323,7 @@
 
 %description tds
 Modules for Asterisk that use FreeTDS.
+%endif
 
 %package unistim
 Summary: Unistim channel for Asterisk
@@ -417,6 +420,10 @@
 %{__perl} -pi -e 's/^all:.*$/all:/' sounds/Makefile
 %{__perl} -pi -e 's/^install:.*$/install:/' sounds/Makefile
 
+%if !%{with_freetds}
+%{__perl} -pi -e 's/^MENUSELECT_CDR=(.*)$/MENUSELECT_CDR=\1 cdr_tds/' menuselect.makeopts
+%endif
+
 # convert comments in one file to UTF-8
 mv main/fskmodem.c main/fskmodem.c.old
 iconv -f iso-8859-1 -t utf-8 -o main/fskmodem.c main/fskmodem.c.old
@@ -527,6 +534,10 @@
 find doc/api/html -name \*.map -size 0 -delete
 %endif
 
+%if !%{with_freetds}
+rm -f %{buildroot}%{_sysconfdir}/asterisk/cdr_tds.conf
+%endif
+
 %clean
 rm -rf %{buildroot}
 
@@ -968,10 +979,12 @@
 %config(noreplace) %{_sysconfdir}/asterisk/cdr_sqlite3_custom.conf
 %{_libdir}/asterisk/modules/cdr_sqlite3_custom.so
 
+%if %{with_freetds}
 %files tds
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/asterisk/cdr_tds.conf
 %{_libdir}/asterisk/modules/cdr_tds.so
+%endif
 
 %files unistim
 %defattr(-,root,root,-)
@@ -1019,6 +1032,9 @@
 %{_libdir}/asterisk/modules/codec_zap.so
 
 %changelog
+* Thu Jun 12 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0-0.16.beta9
+- Disable building cdr_tds since new FreeTDS in rawhide no longer provides needed library.
+
 * Wed Jun 11 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0-0.15.beta9
 - Bump release and rebuild to fix libtds breakage.
 




More information about the fedora-extras-commits mailing list