[cmusphinx3] Rebuild for sphinxbase 0.8.

[Jerry James]

commit 57a33f5ecfdd645849978a44862bda322cfe538b
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Mon Dec 17 14:28:35 2012 -0700

    Rebuild for sphinxbase 0.8.

 cmusphinx3.spec      |   19 +++++++++++++++++--
 sphinx3-format.patch |   11 +++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
---
diff --git a/cmusphinx3.spec b/cmusphinx3.spec
index 945e2c3..78dcf88 100644
--- a/cmusphinx3.spec
+++ b/cmusphinx3.spec
@@ -1,6 +1,6 @@
 Name:           cmusphinx3
 Version:        0.8
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Large vocabulary speech recognition in C
 
 Group:          Applications/Multimedia
@@ -25,9 +25,13 @@ Patch3:         sphinx3-link.patch
 # This patch was sent upstream on 2012 Feb 17, and has been applied.  It fixes
 # two problems identified by cpychecker.
 Patch4:         sphinx3-cpychecker.patch
+# This patch has not been sent upstream yet.  It fixes one lack of agreement
+# between a printf format specifier and the corresponding argument type.
+Patch5:         sphinx3-format.patch
 
 BuildRequires:  alsa-lib-devel
 BuildRequires:  doxygen
+BuildRequires:  libbsd-devel
 BuildRequires:  pkgconfig
 BuildRequires:  python2-devel
 BuildRequires:  sphinxbase-devel
@@ -84,8 +88,9 @@ Doxygen documentation for cmusphinx3.
 %patch2 -p1
 %patch3 -p1
 %patch4
+%patch5
 
-# Adapt to sphinxbase 0.7
+# Adapt to sphinxbase 0.7+
 sed -i 's/heap_t /heap_t */' src/libs3decoder/libsearch/vithist.c
 
 # Remove executable bits from the documentation
@@ -94,6 +99,13 @@ find doc -type f | xargs chmod a-x
 # Dispose of version control files in the documentation
 rm -fr doc/images/.svn doc/s3/.svn doc/s3-2_files/.svn
 
+# Let the sources find libutil.h
+for f in src/libs3decoder/libcfg/s3_cfg_convert.c src/libs3decoder/libsearch/fsg_history.c; do
+  sed -e "s|libutil\.h|bsd/&|" $f > $f.new
+  touch -r $f $f.new
+  mv -f $f.new $f
+done
+
 # Convert the encoding of one file
 cd doc/s3-2_files
 iconv -f WINDOWS-1252 -t UTF-8 master03_stylesheet.css > x.css
@@ -156,6 +168,9 @@ rm -f doc/images/Makefile doc/s3/*.fig
 %doc doc/*.txt doc/sphinx3.4.code.tracing doc/sphinx3.5_refactoring.note html
 
 %changelog
+* Mon Dec 17 2012 Jerry James <loganjerry at gmail.com> - 0.8-13
+- Rebuild for sphinxbase 0.8
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sphinx3-format.patch b/sphinx3-format.patch
new file mode 100644
index 0000000..c884485
--- /dev/null
+++ b/sphinx3-format.patch
@@ -0,0 +1,11 @@
+--- ./src/libs3decoder/libsearch/dag.c.orig	2008-12-31 11:27:56.000000000 -0700
++++ ./src/libs3decoder/libsearch/dag.c	2012-12-17 14:17:51.992896859 -0700
+@@ -721,7 +721,7 @@ dag_write_header(FILE * fp, cmd_ln_t *co
+     if (cmd_ln_exists_r(config, "-senmgau") && cmd_ln_str_r(config, "-senmgau"))
+         fprintf(fp, "# -senmgau %s\n", cmd_ln_str_r(config, "-senmgau"));
+     if (cmd_ln_exists_r(config, "-min_endfr")) {
+-        fprintf(fp, "# -min_endfr %ld\n", cmd_ln_int32_r(config, "-min_endfr"));
++        fprintf(fp, "# -min_endfr %d\n", cmd_ln_int32_r(config, "-min_endfr"));
+     }
+     fprintf(fp, "#\n");
+ }