[libpri: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/libpri

[Jeffrey C. Ollie]

commit 5f4dd0efd44dd7dfbdd2a6c0e37f95b4828d421b
Merge: f95f9da a1a487f
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Tue Feb 8 09:37:47 2011 -0600

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/libpri
    
    Conflicts:
    	libpri.spec

 libpri.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc libpri.spec
index 8a82784,e219dc7..94f9ce6
--- a/libpri.spec
+++ b/libpri.spec
@@@ -59,52 -59,9 +59,55 @@@ rm -rf %{buildroot
  %{_libdir}/libpri.so
  
  %changelog
 +* Mon Feb  7 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.12-0.3.beta3
 +-
 +- The following are some of the issues resolved in this beta release:
 +-
 +-   * Prevent a CONNECT message from sending a CONNECT ACKNOWLEDGE in the
 +-     wrong state.
 +-     (issue #17360. Reported by: shawkris. Patched by rmudgett)
 +-
 +-   * Made Q.921 delay events to Q.931 if the event could immediately
 +-     generate response frames.
 +-     (closes issue #17360. Reported by: shawkris. Patched by rmudgett)
 +-
 +-   * BRI PTMP: Active channels not cleared when the interface goes down.
 +-     (closes issue #17865. Reported by: wimpy. Patched by rmudgett)
 +-
 +-   * Segfault in pri_schedule_del() - ctrl value is invalid.
 +-     (closes issue #17522)
 +-     (closes issue #18032. Reported by: schmoozecom. Patched by rmudgett)
 +-
 +-   * Crash when receiving an unknown/unsupported message type.
 +-     (closes issue #17968. Reported by: gelo. Patched by rmudgett)
 +-
 +-   * B410P gets incoming call packets on ISDN but Asterisk doesn't see the
 +-     call.
 +-     (closes issue #18232. Reported by: lelio. Patched by rmudgett)
 +-
 +-   * SABME flood on backup D-channel in NFAS configuration.
 +-     (closes issue #18255. Reported by: bklang. Patched by rmudgett)
 +-
 +-   * Asterisk is getting a "No D-channels available!" warning message every
 +-     4 seconds.
 +-     (closes issue #17270. Reported by: jmls. Patched by rmudgett)
 +-
 +- This beta release contains several new features, among them:
 +-
 +- 1.) ETSI and Q.SIG Call Completion Supplementary Service (CCSS) support
 +- 2.) ETSI Advice Of Charge (AOC) support
 +- 3.) ETSI Explicit Call Transfer (ECT) support
 +- 4.) ETSI Call Waiting support for ISDN phones
 +- 5.) ETSI Malicious Call ID support
 +-
 +- For a full list of changes in the current release candidate, please see
 +- the ChangeLog:
 +-
 +- http://downloads.asterisk.org/pub/telephony/libpri/releases/ChangeLog-1.4.12-beta3
 +
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.12-0.2.beta2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Fri Oct  8 2010 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.4.12-0.2.beta2
  - The following are some of the issues resolved in this beta release:
  -