[sphinxtrain] Rebuild for opengrm-ngram 1.1.0.

[Jerry James]

commit 074c7f45403a7f96618662f1775d6cad1f897734
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Fri Sep 6 09:21:03 2013 -0600

    Rebuild for opengrm-ngram 1.1.0.

 sphinxtrain-opengrm.patch |   21 +++++++++++++++++++++
 sphinxtrain.spec          |   10 ++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/sphinxtrain-opengrm.patch b/sphinxtrain-opengrm.patch
new file mode 100644
index 0000000..e81ecd7
--- /dev/null
+++ b/sphinxtrain-opengrm.patch
@@ -0,0 +1,21 @@
+--- ./src/programs/g2p_train/g2p_train.cpp.orig	2013-02-06 13:43:13.050273099 -0700
++++ ./src/programs/g2p_train/g2p_train.cpp	2013-09-05 22:00:00.000000000 -0600
+@@ -24,14 +24,14 @@
+ #include <fst/script/print.h>
+ #include <ngram/ngram-shrink.h>
+ #include <ngram/ngram-relentropy.h>
+-#include <ngram/ngram-seymoreshrink.h>
+-#include <ngram/ngram-countprune.h>
++#include <ngram/ngram-seymore-shrink.h>
++#include <ngram/ngram-count-prune.h>
+ #include <ngram/ngram-input.h>
+ #include <ngram/ngram-make.h>
+-#include <ngram/ngram-kneserney.h>
++#include <ngram/ngram-kneser-ney.h>
+ #include <ngram/ngram-absolute.h>
+ #include <ngram/ngram-katz.h>
+-#include <ngram/ngram-wittenbell.h>
++#include <ngram/ngram-witten-bell.h>
+ #include <ngram/ngram-unsmoothed.h>
+ #include <sphinxbase/err.h>
+ #include "M2MFstAligner.hpp"
diff --git a/sphinxtrain.spec b/sphinxtrain.spec
index b5deb89..5274b43 100644
--- a/sphinxtrain.spec
+++ b/sphinxtrain.spec
@@ -3,7 +3,7 @@
 
 Name:           sphinxtrain
 Version:        1.0.8
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Acoustic model trainer for CMU's Sphinx tools
 
 Group:          Applications/Multimedia
@@ -19,6 +19,8 @@ Patch0:         %{name}-extension.patch
 Patch1:         %{name}-openfst.patch
 # Sent upstream 28 Mar 2013.  Enable large file support.
 Patch2:         %{name}-largefile.patch
+# Adapt to opengrm-ngram 1.1.0
+Patch3:         %{name}-opengrm.patch
 
 BuildRequires:  Cython
 BuildRequires:  lapack-devel
@@ -65,6 +67,7 @@ Python interface to cmusphinx3.
 %patch0
 %patch1
 %patch2
+%patch3
 
 # Add an accidentally omitted header file
 cp -p %{SOURCE1} src/programs/g2p_train
@@ -155,7 +158,10 @@ find %{buildroot}%{_libdir}/%{name}/scripts/lib -name \*.pm -o -name \*.txt | \
 %{python_sitearch}/cmusphinx/
 
 %changelog
-* Mon Aug 19 2013 Jerry JUames <loganjerry at gmail.com> - 1.0.8-8
+* Fri Sep  6 2013 Jerry James <loganjerry at gmail.com> - 1.0.8-9
+- Rebuild for opengrm-ngram 1.1.0
+
+* Mon Aug 19 2013 Jerry James <loganjerry at gmail.com> - 1.0.8-8
 - Find library files on 64-bit systems (bz 997986)
 
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-7