[sphinxbase] New upstream release.

Jerry James jjames at fedoraproject.org
Mon Aug 16 21:04:09 UTC 2010 

commit 5f9079df20019fbf106e86e559ba9cd66501ccc2
Author: Jerry James <loganjerry at gmail.com>
Date:   Mon Aug 16 14:23:05 2010 -0600

    New upstream release.

 .gitignore                                         |    2 +-
 sources                                            |    2 +-
 ...1-python.patch => sphinxbase-0.6.1-python.patch |   11 ++--
 sphinxbase.spec                                    |   53 +++++++++++--------
 4 files changed, 38 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 70d6482..8e63e6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-sphinxbase-0.4.1.tar.bz2
+sphinxbase-0.6.1.tar.gz
diff --git a/sources b/sources
index 9641792..ea642a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e36d3efcf70a37bb3c56c780abb6f8d  sphinxbase-0.4.1.tar.bz2
+208afc57bb91942f3aea62087595d008  sphinxbase-0.6.1.tar.gz
diff --git a/sphinxbase-0.4.1-python.patch b/sphinxbase-0.6.1-python.patch
similarity index 55%
rename from sphinxbase-0.4.1-python.patch
rename to sphinxbase-0.6.1-python.patch
index 01543ca..4ac66b8 100644
--- a/sphinxbase-0.4.1-python.patch
+++ b/sphinxbase-0.6.1-python.patch
@@ -1,12 +1,11 @@
-diff -dur sphinxbase-0.4.1.ORIG/python/Makefile.in sphinxbase-0.4.1/python/Makefile.in
---- sphinxbase-0.4.1.ORIG/python/Makefile.in	2008-11-29 14:42:40.000000000 -0700
-+++ sphinxbase-0.4.1/python/Makefile.in	2009-03-18 21:36:50.000000000 -0600
-@@ -421,7 +421,7 @@
+--- python/Makefile.in.orig	2010-07-29 15:00:01.000000000 -0600
++++ python/Makefile.in	2010-08-16 13:51:00.308067945 -0600
+@@ -479,7 +479,7 @@
  @BUILD_PYTHON_TRUE at all-local: pymod-build-stamp
  
  @BUILD_PYTHON_TRUE at install-exec-local: pymod-build-stamp
-- at BUILD_PYTHON_TRUE@	$(PYTHON) setup.py install --prefix $(DESTDIR)$(prefix)
-+ at BUILD_PYTHON_TRUE@	$(PYTHON) setup.py install --skip-build --root $(DESTDIR)
+- at BUILD_PYTHON_TRUE@	$(PYTHON) setup.py install --prefix $(DESTDIR)$(prefix) $(SETUPTOOLS_CRAP)
++ at BUILD_PYTHON_TRUE@	$(PYTHON) setup.py install --skip-build --root $(DESTDIR) $(SETUPTOOLS_CRAP)
  
  @BUILD_PYTHON_TRUE at uninstall-local:
  @BUILD_PYTHON_TRUE@	$(PYTHON) setup.py bogus_uninstall --prefix $(DESTDIR)$(prefix)
diff --git a/sphinxbase.spec b/sphinxbase.spec
index aa1034e..2d98c7b 100644
--- a/sphinxbase.spec
+++ b/sphinxbase.spec
@@ -1,20 +1,20 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           sphinxbase
-Version:        0.4.1
-Release:        3%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        Common library for CMU Sphinx voice recognition products
 
 Group:          Development/Libraries
 License:        BSD
-URL:            http://www.cmusphinx.org/
-Source0:        http://downloads.sourceforge.net/cmusphinx/%{name}-%{version}.tar.bz2
+URL:            http://cmusphinx.sourceforge.net/
+Source0:        http://downloads.sourceforge.net/cmusphinx/%{name}-%{version}.tar.gz
 # This patch has not been sent upstream, as it fixes a Fedora-specific problem.
 # Install the Python egg in the Fedora way.
-Patch0:         sphinxbase-0.4.1-python.patch
+Patch0:         sphinxbase-0.6.1-python.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  alsa-lib-devel, blas-devel, doxygen, lapack-devel
+BuildRequires:  alsa-lib-devel, blas-devel, Cython, doxygen, lapack-devel
 BuildRequires:  perl, python-devel, python-setuptools, tex(latex)
 
 %description
@@ -46,30 +46,37 @@ Python interface to sphinxbase.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0
 
-iconv -f ISO8859-1 -t UTF-8 AUTHORS > AUTHORS.new
+iconv -f ISO8859-1 -t UTF-8 -o AUTHORS.new AUTHORS
+touch -r AUTHORS.new AUTHORS
 mv -f AUTHORS.new AUTHORS
 
+# Force code generation with a newer version of Cython
+rm -f python/sphinxbase.c
+
+# Remove spurious executable bits
+chmod a-x src/sphinx_fe/sphinx_fe.c src/sphinx_fe/sphinx_wave2feat.h
+
 %build
-%configure --disable-dependency-tracking --disable-static
+%configure --disable-static --disable-rpath
 
 # Get rid of undesirable hardcoded runpaths
 sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
        -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 # Get rid of undesirable direct library dependencies
-sed -i -e 's/-lpthread -lm -lblas -llapack/-lm/g' src/libsphinxad/Makefile
-sed -i -e 's/-lasound //g' src/libsphinxbase/Makefile
-sed -i -e 's/-lasound //g' src/libsphinxbase/fe/Makefile
-sed -i -e 's/-lasound //g' src/libsphinxbase/feat/Makefile
-sed -i -e 's/-lasound //g' src/libsphinxbase/lm/Makefile
-sed -i -e 's/-lasound //g' src/libsphinxbase/util/Makefile
-sed -i -e 's/-lasound //g' src/sphinx_adtools/Makefile
-sed -i -e 's/-lasound //g' src/sphinx_cepview/Makefile
-sed -i -e 's/-lasound //g' src/sphinx_fe/Makefile
-sed -i -e 's/-lasound //g' src/sphinx_jsgf2fsg/Makefile
-sed -i -e 's/-lasound //g' src/sphinx_lmtools/Makefile
+sed -i -e 's/-lpthread -lm -lblas -llapack/-lm/' src/libsphinxad/Makefile
+sed -i -e 's/-lasound //' src/libsphinxbase/Makefile
+sed -i -e 's/-lasound //' src/libsphinxbase/fe/Makefile
+sed -i -e 's/-lasound //' src/libsphinxbase/feat/Makefile
+sed -i -e 's/-lasound //' src/libsphinxbase/lm/Makefile
+sed -i -e 's/-lasound //' src/libsphinxbase/util/Makefile
+sed -i -e 's/-lasound //' src/sphinx_adtools/Makefile
+sed -i -e 's/-lasound //' src/sphinx_cepview/Makefile
+sed -i -e 's/-lasound //' src/sphinx_fe/Makefile
+sed -i -e 's/-lasound //' src/sphinx_jsgf2fsg/Makefile
+sed -i -e 's/-lasound //' src/sphinx_lmtools/Makefile
 
 # Build the programs and libraries
 make %{?_smp_mflags}
@@ -81,7 +88,6 @@ for prog in sphinx_cepview sphinx_fe; do
   perl args2man.pl ../src/${prog}/${prog} < ${prog}.1.in > ${prog}.1
 done
 perl args2man.pl ../src/sphinx_adtools/sphinx_pitch < sphinx_pitch.1.in > sphinx_pitch.1
-perl args2man.pl ../src/sphinx_lmtools/sphinx_lm_eval < sphinx_lm_eval.1.in > sphinx_lm_eval.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -102,7 +108,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/*
 %{_mandir}/man1/*
 
@@ -116,6 +121,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libsphinxad.so.*
 %{_libdir}/libsphinxbase.so.*
 
@@ -124,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*
 
 %changelog
+* Mon Aug 16 2010 Jerry James <loganjerry at gmail.com> - 0.6.1-1
+- New upstream release
+
 * Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 0.4.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild

More information about the scm-commits mailing list