[pocketsphinx] New upstream release.

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

commit 9f7883f2921fb8396a7bdd70900fe0aaf659e079
Author: Jerry James <loganjerry at gmail.com>
Date:   Mon Aug 16 14:59:57 2010 -0600

    New upstream release.

 .gitignore                                         |    2 +-
 pocketsphinx-0.5.1-doc.patch                       |   33 -----------------
 ...python.patch => pocketsphinx-0.6.1-python.patch |   11 +++---
 pocketsphinx.spec                                  |   37 +++++++++++--------
 sources                                            |    2 +-
 5 files changed, 28 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 36f20ff..4674400 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-pocketsphinx-0.5.1.tar.bz2
+pocketsphinx-0.6.1.tar.gz
diff --git a/pocketsphinx-0.5.1-python.patch b/pocketsphinx-0.6.1-python.patch
similarity index 54%
rename from pocketsphinx-0.5.1-python.patch
rename to pocketsphinx-0.6.1-python.patch
index f7a0bd0..f152c87 100644
--- a/pocketsphinx-0.5.1-python.patch
+++ b/pocketsphinx-0.6.1-python.patch
@@ -1,12 +1,11 @@
-diff -dur pocketsphinx-0.5.1.ORIG/python/Makefile.in pocketsphinx-0.5.1/python/Makefile.in
---- pocketsphinx-0.5.1.ORIG/python/Makefile.in	2008-11-29 14:46:47.000000000 -0700
-+++ pocketsphinx-0.5.1/python/Makefile.in	2009-03-24 13:53:36.000000000 -0600
-@@ -429,7 +429,7 @@
+--- python/Makefile.in.orig	2010-07-29 15:02:38.000000000 -0600
++++ python/Makefile.in	2010-08-16 14:51:08.933012697 -0600
+@@ -482,7 +482,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/pocketsphinx.spec b/pocketsphinx.spec
index e571323..eca87b4 100644
--- a/pocketsphinx.spec
+++ b/pocketsphinx.spec
@@ -1,23 +1,20 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           pocketsphinx
-Version:        0.5.1
-Release:        5%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        Real-time speech recognition
 
 Group:          Applications/Multimedia
-License:        BSD and LGPLv2+
+License:        BSD
 URL:            http://www.pocketsphinx.org/
-Source0:        http://downloads.sourceforge.net/cmusphinx/%{name}-%{version}.tar.bz2
-# Fix the building of doxygen documentation
-Patch0:         pocketsphinx-0.5.1-doc.patch
+Source0:        http://downloads.sourceforge.net/cmusphinx/%{name}-%{version}.tar.gz
 # Install the Python egg in the Fedora way.
-Patch1:         pocketsphinx-0.5.1-python.patch
+Patch0:         pocketsphinx-0.6.1-python.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  doxygen, gstreamer-devel, gstreamer-plugins-base-devel
+BuildRequires:  Cython, doxygen, gstreamer-devel, gstreamer-plugins-base-devel
 BuildRequires:  pkgconfig, python-devel, python-setuptools, sphinxbase-devel
-BuildRequires:  alsa-lib-devel
 
 %description
 PocketSphinx is a version of the open-source Sphinx-II speech recognition
@@ -59,18 +56,23 @@ Python interface to pocketsphinx.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0
+
+# Force code generation with a newer version of Cython
+rm -f python/pocketsphinx.c
+
+# Remove spurious executable bits
+chmod a-x src/libpocketsphinx/ptm_mgau.*
 
 %build
 %configure --disable-dependency-tracking --disable-static
 
 # Get rid of undesirable hardcoded runpaths
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+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/ -lsphinxad//g' src/libpocketsphinx/Makefile
+sed -i -e 's/ -lsphinxad//' src/libpocketsphinx/Makefile
 
 make %{?_smp_mflags}
 
@@ -86,7 +88,6 @@ cp -p doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 # Get rid of files we don't want packaged
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-0.10/*.la
-rm -f $RPM_BUILD_ROOT%{_datadir}/pocketsphinx/model/lm/turtle/turtle.handdict
 rm -f doc/html/installdox
 
 %clean
@@ -98,7 +99,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/*
 %{_datadir}/pocketsphinx
 %{_mandir}/man1/*
@@ -112,6 +112,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libpocketsphinx.so.*
 
 %files plugin
@@ -123,6 +124,10 @@ 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
+- All sources are now BSD
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.5.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
diff --git a/sources b/sources
index 7206434..5087edf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d257aa7ac2720669fa0ed5e6b91a0bbf  pocketsphinx-0.5.1.tar.bz2
+f5c737819b61a135dd0cc3cab573ae7a  pocketsphinx-0.6.1.tar.gz

More information about the scm-commits mailing list