[sphinxtrain] Rebuild for sphinxbase linked with atlas. Minor spec file cleanups.

[Jerry James]

commit 95bee51ad3342563634d3c9e15af24379b575541
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Wed Nov 12 11:35:32 2014 -0700

    Rebuild for sphinxbase linked with atlas.
    Minor spec file cleanups.

 sphinxtrain.spec |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/sphinxtrain.spec b/sphinxtrain.spec
index 75ef0df..6020120 100644
--- a/sphinxtrain.spec
+++ b/sphinxtrain.spec
@@ -3,7 +3,7 @@
 
 Name:           sphinxtrain
 Version:        1.0.8
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Acoustic model trainer for CMU's Sphinx tools
 
 Group:          Applications/Multimedia
@@ -25,17 +25,14 @@ Patch3:         %{name}-opengrm.patch
 Patch4:         %{name}-1.0.8-bigendian.patch
 
 BuildRequires:  Cython
-BuildRequires:  lapack-devel
-BuildRequires:  libsamplerate-devel
-BuildRequires:  libsndfile-devel
-BuildRequires:  opengrm-ngram-devel
 BuildRequires:  libtool
+BuildRequires:  opengrm-ngram-devel
 BuildRequires:  perl
-BuildRequires:  sphinxbase-devel
-BuildRequires:  sphinxbase-python
+BuildRequires:  pkgconfig(sphinxbase)
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
 BuildRequires:  scipy
+BuildRequires:  sphinxbase-python
 
 Requires:       perl(:MODULE_COMPAT_%{perl_version})
 Requires:       openfst-tools
@@ -49,9 +46,6 @@ Requires:       sphinxbase
 %global __requires_exclude %{__requires_exclude}|Queue
 %global __requires_exclude %{__requires_exclude}|SphinxTrain::Util
 
-# Don't provide the python interface glue
-%global __provides_exclude_from ^%{_libdir}/python.*\\.so$
-
 %description
 SphinxTrain is Carnegie Mellon University's open source acoustic model
 trainer.  It contains the scripts and instructions necessary for building
@@ -88,7 +82,7 @@ function tweak()
   mv -f $2.new $2
 }
 
-if [ %{__isa_bits} = "64" ]; then
+if [ "%{_libdir}" = "%{_prefix}/lib64" ]; then
   tweak 's,lib/,lib64/,' scripts/sphinxtrain
   tweak "s,'lib','lib64'," scripts/000.comp_feat/make_feats.pl
   tweak "s,'lib','lib64'," scripts/000.comp_feat/slave_feat.pl
@@ -123,7 +117,7 @@ export CXXFLAGS="$CFLAGS -std=c++11"
 # -Wl,--as-needed after all the libraries.
 sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
     -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
-    -e 's|CC="g..|& -Wl,--as-needed|' \
+    -e 's|CC="\(g..\)"|CC="\1 -Wl,--as-needed"|' \
     -i libtool
 #"
 make %{?_smp_mflags}
@@ -155,7 +149,8 @@ find %{buildroot}%{_libdir}/%{name}/scripts/lib -name \*.pm -o -name \*.txt | \
   xargs chmod 0644
 
 %files
-%doc COPYING NEWS README
+%doc NEWS README
+%license COPYING
 %{_bindir}/%{name}
 %{_libexecdir}/%{name}/
 %{_libdir}/%{name}/
@@ -166,6 +161,10 @@ find %{buildroot}%{_libdir}/%{name}/scripts/lib -name \*.pm -o -name \*.txt | \
 %{python_sitearch}/cmusphinx/
 
 %changelog
+* Wed Nov 12 2014 Jerry James <loganjerry at gmail.com> - 1.0.8-16
+- Rebuild for sphinxbase linked with atlas
+- Minor spec file cleanups
+
 * Wed Aug 27 2014 Jitka Plesnikova <jplesnik at redhat.com> - 1.0.8-15
 - Perl 5.20 rebuild