commit 05cac15215ee5b5acfccd264f91ef40d72b4e860
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date:   Wed Mar 7 18:37:40 2018 +0100

    - updated to 0.8
    - removed outdated names patch
    - added am patch (fix automake issue)
    - added update patch (adjust for sphinxbase 0.8)
    - added format patch (fix missing format string issues)
    - added install patch (avoid duplicates in install when sources contain 
processed .in files)
    - added link patch (link libs3decoder with required libraries)

 sphinx3-am.patch      |  7 ++++
 sphinx3-format.patch  | 20 +++++++++++
 sphinx3-install.patch | 11 ++++++
 sphinx3-link.patch    |  9 +++++
 sphinx3-names.patch   | 54 ------------------------------
 sphinx3-update.patch  | 29 ++++++++++++++++
 sphinx3.spec          | 92 +++++++++++++++++++++++++++++++++++----------------
 7 files changed, 140 insertions(+), 82 deletions(-)
---
diff --git a/sphinx3.spec b/sphinx3.spec
index d440808..ca60ada 100644
--- a/sphinx3.spec
+++ b/sphinx3.spec
@@ -1,17 +1,23 @@
-Summary:       Speech recognitnion engine
-Summary(pl.UTF-8):     System rozpoznawania mowy
+Summary:       CMU Sphinx III - Speech recognitnion engine
+Summary(pl.UTF-8):     CMU Sphinx III - System rozpoznawania mowy
 Name:          sphinx3
-Version:       0.5
+Version:       0.8
 Release:       1
 License:       BSD-like
 Group:         Applications/Communications
-Source0:       http://dl.sourceforge.net/cmusphinx/%{name}-%{version}.tar.gz
-# Source0-md5: 71a98518b740f2e80aec86c58148d8c0
-Patch0:                %{name}-names.patch
-URL:           http://www.speech.cs.cmu.edu/sphinx/
+Source0:       
http://downloads.sourceforge.net/cmusphinx/%{name}-%{version}.tar.bz2
+# Source0-md5: e32bf4c507509b27482adf4cfc467e8f
+Patch0:                %{name}-am.patch
+Patch1:                %{name}-update.patch
+Patch2:                %{name}-format.patch
+Patch3:                %{name}-install.patch
+Patch4:                %{name}-link.patch
+URL:           https://cmusphinx.github.io/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
+BuildRequires: sphinxbase-devel >= 0.8
+Requires:      sphinxbase >= 0.8
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -27,34 +33,54 @@ słownikiem, pochodzący z Carnegie Mellon University.
 Podłącz mikrofon, uruchom sphinx3-simple i testuj!
 
 %package devel
-Summary:       %{name} header files
-Summary(pl.UTF-8):     Pliki nagłówkowe %{name}
+Summary:       CMU Sphinx III header files
+Summary(pl.UTF-8):     Pliki nagłówkowe bibliotek CMU Sphinx III
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      sphinxbase-devel >= 0.8
 
 %description devel
-%{name} header files.
+CMU Sphinx III header files.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe %{name}.
+Pliki nagłówkowe bibliotek CMU Sphinx III.
 
 %package static
-Summary:       Static sphinx3 libraries
-Summary(pl.UTF-8):     Biblioteki statyczne sphinx3
+Summary:       Static CMU Sphinx III libraries
+Summary(pl.UTF-8):     Biblioteki statyczne CMU Sphinx III
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
-Static version of sphinx3 libraries.
+Static version of CMU Sphinx III libraries.
 
 %description static -l pl.UTF-8
-Statyczne wersje bibliotek sphinx3.
+Statyczne wersje bibliotek CMU Sphinx III.
+
+%package doc
+Summary:       Documentation for CMU Sphinx III
+Summary(pl.UTF-8):     Dokumentacja pakietu CMU Sphinx III
+Group:         Documentation
+
+%description doc
+Documentation for CMU Sphinx III.
+
+%description doc -l pl.UTF-8
+Dokumentacja pakietu CMU Sphinx III.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+find doc -name .svn | xargs %{__rm} -r
 
-find doc -name CVS | xargs rm -rf
+# subdirs install is broken
+mkdir -p doc/.hidden
+%{__mv} doc/{images,s3,s3-2_files} doc/.hidden
 
 %build
 %{__libtoolize}
@@ -70,11 +96,16 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-# hmm, name may conflict
-rm -f $RPM_BUILD_ROOT%{_bindir}/batch.csh
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libs3decoder.la
+
+install -d $RPM_BUILD_ROOT%{_docdir}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc 
$RPM_BUILD_ROOT%{_docdir}/%{name}
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/doxygen.{cfg,main}
+# remaining files, not handled properly by automake install
+cp -pr doc/.hidden/{images,s3,s3-2_files} $RPM_BUILD_ROOT%{_docdir}/%{name}
+%{__rm} 
$RPM_BUILD_ROOT%{_docdir}/%{name}/{images/Makefile,s3-2_files/{Makefile,filelist.xml}}
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
-rm -f doc/Makefile*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -84,18 +115,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS README doc
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/*.so.*.*
+%doc AUTHORS COPYING ChangeLog NEWS README
+%attr(755,root,root) %{_bindir}/sphinx3-simple
+%attr(755,root,root) %{_bindir}/sphinx3_*
+%attr(755,root,root) %{_libdir}/libs3decoder.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libs3decoder.so.0
 %{_datadir}/%{name}
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so
-%{_libdir}/*.la
-# no installable headers (yet?)
-#%%{_includedir}/*
+%attr(755,root,root) %{_libdir}/libs3decoder.so
+%{_includedir}/sphinx3
+%{_pkgconfigdir}/sphinx3.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libs3decoder.a
+
+%files doc
+%defattr(644,root,root,755)
+%{_docdir}/%{name}
diff --git a/sphinx3-am.patch b/sphinx3-am.patch
new file mode 100644
index 0000000..7551d5c
--- /dev/null
+++ b/sphinx3-am.patch
@@ -0,0 +1,7 @@
+--- sphinx3-0.8/src/tests/unit_tests/test_logs3/Makefile.am.orig       
2009-01-01 05:08:51.000000000 +0100
++++ sphinx3-0.8/src/tests/unit_tests/test_logs3/Makefile.am    2018-03-04 
22:05:27.279616164 +0100
+@@ -8,4 +8,3 @@
+ LDADD = ${top_builddir}/src/libs3decoder/libs3decoder.la \
+         -lsphinxbase -lm @ad_libs@
+ 
+-TESTS = $(wildcard _*.test) 
diff --git a/sphinx3-format.patch b/sphinx3-format.patch
new file mode 100644
index 0000000..c723a68
--- /dev/null
+++ b/sphinx3-format.patch
@@ -0,0 +1,20 @@
+--- sphinx3-0.8/src/libs3decoder/libcfg/s3_cfg.c.orig  2008-12-31 
19:27:55.000000000 +0100
++++ sphinx3-0.8/src/libs3decoder/libcfg/s3_cfg.c       2018-03-05 
21:12:21.488666006 +0100
+@@ -838,7 +838,7 @@
+     index = s3_cfg_id2index(_rule->products[i]);
+     item = (s3_cfg_item_t *)s3_arraylist_get(&_cfg->item_info, index);
+ 
+-    fprintf(_out, item->name);
++    fputs(item->name, _out);
+     if (i != len - 1)
+       fprintf(_out, " ");
+   }
+@@ -879,7 +879,7 @@
+     index = s3_cfg_id2index(rule->products[i]);
+     item = (s3_cfg_item_t *)s3_arraylist_get(&_cfg->item_info, index);
+ 
+-    fprintf(_out, item->name);
++    fputs(item->name, _out);
+     fprintf(_out, " ");
+   }
+ 
diff --git a/sphinx3-install.patch b/sphinx3-install.patch
new file mode 100644
index 0000000..43532df
--- /dev/null
+++ b/sphinx3-install.patch
@@ -0,0 +1,11 @@
+--- sphinx3-0.8/configure.in.orig      2009-01-01 05:23:23.000000000 +0100
++++ sphinx3-0.8/configure.in   2018-03-05 21:31:45.131986051 +0100
+@@ -71,7 +71,7 @@
+ tidigitsdata=`(cd $srcdir/model/hmm/tidigits && find . -type f -print | egrep 
-v '(Makefile|CVS|\.svn)')`
+ tidigitsdata=`echo $tidigitsdata`
+ 
+-lmdata=`ls -1 $srcdir/model/lm/an4 | egrep -v '(Makefile|CVS)' | sed 
's/\.in//g'`
++lmdata=`ls -1 $srcdir/model/lm/an4 | egrep -v '(Makefile|CVS)' | sed 
's/\.in//g' | sort -u`
+ lmdata=`echo $lmdata`
+ 
+ docdata=`ls -1 $srcdir/doc | egrep -v '(Makefile|CVS)'`
diff --git a/sphinx3-link.patch b/sphinx3-link.patch
new file mode 100644
index 0000000..9a5732c
--- /dev/null
+++ b/sphinx3-link.patch
@@ -0,0 +1,9 @@
+--- sphinx3-0.8/src/libs3decoder/Makefile.am.orig      2008-12-31 
19:27:56.000000000 +0100
++++ sphinx3-0.8/src/libs3decoder/Makefile.am   2018-03-06 05:33:34.918322620 
+0100
+@@ -14,4 +14,5 @@
+       liblm/liblm.la \
+       libsearch/libsearch.la \
+       libAPI/libAPI.la \
+-      libcfg/libcfg.la
++      libcfg/libcfg.la \
++      -lsphinxbase -lm
diff --git a/sphinx3-names.patch b/sphinx3-names.patch
deleted file mode 100644
index 08195b9..0000000
--- a/sphinx3-names.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- sphinx3-0.5/src/libutil/Makefile.am.orig   2004-11-19 22:30:36.000000000 
+0100
-+++ sphinx3-0.5/src/libutil/Makefile.am        2005-11-20 12:46:44.499601888 
+0100
-@@ -1,10 +1,10 @@
- ARCH   = `uname -m | sed s/i.86/i386/`_`uname -s | tr A-Z a-z`
- 
--lib_LTLIBRARIES = libutil.la
-+lib_LTLIBRARIES = libs3util.la
- 
--libutil_la_LDFLAGS = -version-info 0:4:0
-+libs3util_la_LDFLAGS = -version-info 0:4:0
- 
--libutil_la_SOURCES = \
-+libs3util_la_SOURCES = \
-         bitvec.c \
-         case.c \
-         ckd_alloc.c \
---- sphinx3-0.5/src/programs/Makefile.am.orig  2004-12-23 22:05:22.000000000 
+0100
-+++ sphinx3-0.5/src/programs/Makefile.am       2005-11-20 12:47:13.057260464 
+0100
-@@ -1,5 +1,5 @@
- bin_PROGRAMS = livepretend \
--      decode \
-+      s3decode \
-       gausubvq \
-       align \
-       astar \
-@@ -8,7 +8,7 @@
-       ep 
- 
- livepretend_SOURCES = main_livepretend.c
--decode_SOURCES = decode.c
-+s3decode_SOURCES = decode.c
- decode_anytopo_SOURCES = main_decode_anytopo.c s3_dag.c
- 
- align_SOURCES = main_align.c s3_align.c
-@@ -38,7 +38,7 @@
- 
- LDADD = $(top_builddir)/src/libs3decoder/libs3decoder.la \
-       $(top_builddir)/src/libs3audio/libs3audio.la \
--      $(top_builddir)/src/libutil/libutil.la \
-+      $(top_builddir)/src/libutil/libs3util.la \
-       -lm @ad_libs@ 
- # add these for solaris
- # -L/usr/demo/SOUND/lib/ -laudio -lnsl -lsocket
---- sphinx3-0.5/src/tests/programs/Makefile.am.orig    2004-12-14 
04:50:15.000000000 +0100
-+++ sphinx3-0.5/src/tests/programs/Makefile.am 2005-11-20 13:12:42.876692560 
+0100
-@@ -43,7 +43,7 @@
- 
- LDADD = $(top_builddir)/src/libs3decoder/libs3decoder.la \
-       $(top_builddir)/src/libs3audio/libs3audio.la \
--      $(top_builddir)/src/libutil/libutil.la \
-+      $(top_builddir)/src/libutil/libs3util.la \
-       -lm @ad_libs@ 
- 
- 
diff --git a/sphinx3-update.patch b/sphinx3-update.patch
new file mode 100644
index 0000000..bb0d4a1
--- /dev/null
+++ b/sphinx3-update.patch
@@ -0,0 +1,29 @@
+--- sphinx3-0.8/src/libs3decoder/libsearch/fsg_history.c.orig  2008-12-31 
19:27:56.000000000 +0100
++++ sphinx3-0.8/src/libs3decoder/libsearch/fsg_history.c       2018-03-05 
20:58:29.075342176 +0100
+@@ -55,7 +55,6 @@
+ #include <kb.h>
+ /*#include <phone.h>*/
+ #include <search.h>
+-#include "libutil.h"
+ 
+ 
+ #define __FSG_DBG__   0
+--- sphinx3-0.8/src/libs3decoder/libsearch/vithist.c.orig      2008-12-31 
19:27:56.000000000 +0100
++++ sphinx3-0.8/src/libs3decoder/libsearch/vithist.c   2018-03-05 
21:00:58.468673803 +0100
+@@ -647,7 +647,7 @@
+ {
+     int32 se, fe, filler_done, th;
+     vithist_entry_t *ve;
+-    heap_t h;
++    heap_t *h;
+     s3wid_t *wid;
+     int32 i;
+ 
+--- sphinx3-0.8/src/libs3decoder/libcfg/s3_cfg_convert.c.orig  2008-12-31 
19:27:55.000000000 +0100
++++ sphinx3-0.8/src/libs3decoder/libcfg/s3_cfg_convert.c       2018-03-05 
21:12:47.475332376 +0100
+@@ -1,5 +1,4 @@
+ 
+-#include <libutil.h>
+ #include "s3_cfg.h"
+ #include "fsg.h"
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sphinx3.git/commitdiff/05cac15215ee5b5acfccd264f91ef40d72b4e860

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to