[asterisk/f17] Remove asterisk-ais. OpenAIS was removed from Fedora.
Russell Bryant
russellb at fedoraproject.org
Thu Feb 16 21:36:59 UTC 2012
commit f3b7736a97d809a1e49b90ea659317aea7caf19e
Author: Russell Bryant <rbryant at redhat.com>
Date: Thu Feb 16 16:35:11 2012 -0500
Remove asterisk-ais. OpenAIS was removed from Fedora.
asterisk.spec | 30 ++++--------------------------
menuselect.makeopts | 2 +-
2 files changed, 5 insertions(+), 27 deletions(-)
---
diff --git a/asterisk.spec b/asterisk.spec
index e949077..601fb6a 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -20,7 +20,7 @@
Summary: The Open Source PBX
Name: asterisk
Version: 10.0.0
-Release: 1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}.1
+Release: 2%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}.1
License: GPLv2
Group: Applications/Internet
URL: http://www.asterisk.org/
@@ -112,17 +112,6 @@ does voice over IP in three protocols, and can interoperate with
almost all standards-based telephony equipment using relatively
inexpensive hardware.
-%if 0%{?fedora} > 0
-%package ais
-Summary: Modules for Asterisk that use OpenAIS
-Group: Applications/Internet
-Requires: asterisk = %{version}-%{release}
-BuildRequires: openais-devel
-
-%description ais
-Modules for Asterisk that use OpenAIS.
-%endif
-
%package alsa
Summary: Modules for Asterisk that use Alsa sound drivers
Group: Applications/Internet
@@ -483,11 +472,6 @@ rm main/fskmodem.c.old
chmod -x contrib/scripts/dbsep.cgi
-# no openais-devel available for el6
-%if 0%{?rhel} == 6
-%{__perl} -pi -e 's/^MENUSELECT_RES=(.*)$/MENUSELECT_RES=\1 res_ais res_http_post/g' menuselect.makeopts
-%endif
-
%if 0%{?rhel} == 5
# Get the autoconf scripts working with 2.59
%{__perl} -pi -e 's/AC_PREREQ\(2\.60\)/AC_PREREQ\(2\.59\)/g' configure.ac
@@ -613,9 +597,7 @@ rm -rf %{buildroot}%{_sbindir}/hashtest2
find doc/api/html -name \*.map -size 0 -delete
%endif
-%if 0%{?fedora} == 0
rm -f %{buildroot}%{_sysconfdir}/asterisk/ais.conf
-%endif
#rhel6 doesnt have 389 available, nor ices
%if 0%{?rhel} == 6
@@ -1018,13 +1000,6 @@ fi
%attr(0755,asterisk,asterisk) %dir %{astvarrundir}
%endif
-%if 0%{?fedora} > 0
-%files ais
-%defattr(-,root,root,-)
-%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/ais.conf
-%{_libdir}/asterisk/modules/res_ais.so
-%endif
-
%files alsa
%defattr(-,root,root,-)
%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/alsa.conf
@@ -1267,6 +1242,9 @@ fi
%{_libdir}/asterisk/modules/app_voicemail_plain.so
%changelog
+* Thu Feb 16 2012 Russell Bryant <russellb at fedoraproject.org> - 10.0.0-2
+- Remove asterisk-ais. OpenAIS was removed from Fedora.
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.0.0-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/menuselect.makeopts b/menuselect.makeopts
index 6fed6ed..f2f69d3 100644
--- a/menuselect.makeopts
+++ b/menuselect.makeopts
@@ -13,7 +13,7 @@ MENUSELECT_FUNCS=
MENUSELECT_MOH=
MENUSELECT_OPTS_app_voicemail=
MENUSELECT_PBX=
-MENUSELECT_RES=res_config_sqlite res_timing_kqueue
+MENUSELECT_RES=res_config_sqlite res_timing_kqueue res_ais
MENUSELECT_TESTS=test_skel test_heap test_sched test_astobj2 test_dlinklists test_acl test_aoc test_app test_ast_format_str_reduce test_devicestate test_event test_func_file test_gosub test_pbx test_stringfields test_strings test_substitution test_time test_utils test_amihooks test_locale test_logger test_security_events test_poll test_expr test_netsock2 test_db test_format_api test_linkedlists
MENUSELECT_UTILS=aelparse astcanary astdb2sqlite3 astman check_expr check_expr2 conf2ael muted refcounter smsq stereorize streamplayer
MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
More information about the scm-commits
mailing list