[asterisk: 2/2] Fedora Directory Server -> 389 Directory Server

[Jeffrey C. Ollie]

commit 4479a909584157ea0089e4c8dfe5edd223aab51a
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Thu Jun 30 08:15:21 2011 -0500

    Fedora Directory Server -> 389 Directory Server

 asterisk.spec |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/asterisk.spec b/asterisk.spec
index a4e41dc..eb24600 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -10,7 +10,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.8.4.4
-Release: 1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}
+Release: 2%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -236,15 +236,17 @@ BuildRequires: openldap-devel
 LDAP resources for Asterisk.
 
 %if 0%{?rhel} <= 5 || 0%{?fedora}
-%package ldap-fds
-Summary: LDAP resources for Asterisk and the Fedora Directory Server
+%package ldap-389
+Summary: LDAP resources for Asterisk and the 389 Directory Server
 Group: Applications/Internet
 Requires: asterisk = %{version}-%{release}
 Requires: asterisk-ldap = %{version}-%{release}
-Requires: fedora-ds-base
+Requires: 389-ds-base
+Obsoletes: asterisk-ldap-fds < 1.8.4.4-2
+Conflicts: asterisk-ldap-fds < 1.8.4.4-2
 
-%description ldap-fds
-LDAP resources for Asterisk and the Fedora Directory Server.
+%description ldap-389
+LDAP resources for Asterisk and the 389 Directory Server.
 %endif
 
 %package misdn
@@ -1081,7 +1083,7 @@ fi
 %{_libdir}/asterisk/modules/res_config_ldap.so
 
 %if 0%{?rhel} <= 5 || 0%{?fedora}
-%files ldap-fds
+%files ldap-389
 %defattr(-,root,root,-)
 %{_sysconfdir}/dirsrv/schema/99asterisk.ldif
 %endif
@@ -1221,6 +1223,9 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Thu Jun 30 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.8.4.4-2
+- Fedora Directory Server -> 389 Directory Server
+
 * Wed Jun 29 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.8.4.4-1
 - The Asterisk Development Team has announced the release of Asterisk
 - versions 1.4.41.2, 1.6.2.18.2, and 1.8.4.4, which are security