commit pocketsphinx for openSUSE:Factory
Hello community,
here is the log from the commit of package pocketsphinx for openSUSE:Factory
checked in at 2020-03-26 23:38:07
Comparing /work/SRC/openSUSE:Factory/pocketsphinx (Old)
and /work/SRC/openSUSE:Factory/.pocketsphinx.new.3160 (New)
Package is "pocketsphinx"
Thu Mar 26 23:38:07 2020 rev:5 rq:788659 version:0.8
Changes:
--- /work/SRC/openSUSE:Factory/pocketsphinx/pocketsphinx.changes
2020-03-25 23:50:56.980010190 +0100
+++ /work/SRC/openSUSE:Factory/.pocketsphinx.new.3160/pocketsphinx.changes
2020-03-26 23:38:08.630880542 +0100
@@ -1,0 +2,11 @@
+Thu Mar 26 10:22:01 UTC 2020 - Antonio Larrosa
+
+- Use update-alternatives for the man pages
+- pocketsphinx-devel now conflicts with pocketsphinx5-devel
+- python3-pocketsphinx now conflicts with python3-pocketsphinx5 and
+ python3-pocketsphinx-python <= 0.1.3
+- Fixes for symbol-not-found errors in the python3 port and a small fix
+ to use python3 in another python call. Updated patch:
+ * use-python3.patch
+
+---
Other differences:
--
++ pocketsphinx.spec ++
--- /var/tmp/diff_new_pack.M9h1iN/_old 2020-03-26 23:38:09.678880921 +0100
+++ /var/tmp/diff_new_pack.M9h1iN/_new 2020-03-26 23:38:09.678880921 +0100
@@ -40,6 +40,7 @@
BuildRequires: python3-Cython
BuildRequires: python3-devel
BuildRequires: python3-gobject
+BuildRequires: python3-setuptools
BuildRequires: sphinxbase-devel
Requires(post): update-alternatives
Requires(postun): update-alternatives
@@ -62,6 +63,7 @@
Summary:Development files for pocketsphinx, a speech recognizer library
Group: Development/Libraries/C and C++
Requires: libpocketsphinx%{sover} = %{version}
+Conflicts: pocketsphinx5-devel
%description devel
CMU Sphinx toolkit has a number of packages for different tasks and
@@ -75,6 +77,9 @@
Summary:Python3 bindings for pocketsphinx
Group: Development/Languages/Python
Requires: %{name} = %{version}
+Requires: python3-sphinxbase
+Conflicts: python3-pocketsphinx5
+Conflicts: python3-pocketsphinx-python <= 0.1.3
%description -n python3-pocketsphinx
Pocketsphinx is a version of the open-source CMU Sphinx II speech
@@ -104,6 +109,8 @@
for binary in pocketsphinx_batch pocketsphinx_continuous
pocketsphinx_mdef_convert ; do
mv %{buildroot}%{_bindir}/$binary %{buildroot}%{_bindir}/$binary-%{version}
ln -s %{_sysconfdir}/alternatives/$binary %{buildroot}%{_bindir}/$binary
+mv %{buildroot}%{_mandir}/man1/$binary.1
%{buildroot}%{_mandir}/man1/$binary-%{version}.1
+ln -s %{_sysconfdir}/alternatives/$binary.1%{ext_man}
%{buildroot}%{_mandir}/man1/$binary.1%{ext_man}
done
%check
@@ -112,7 +119,10 @@
%post
update-alternatives --install %{_bindir}/pocketsphinx_batch pocketsphinx_batch
%{_bindir}/pocketsphinx_batch-%{version} 10 \
--slave %{_bindir}/pocketsphinx_continuous pocketsphinx_continuous
%{_bindir}/pocketsphinx_continuous-%{version} \
- --slave %{_bindir}/pocketsphinx_mdef_convert pocketsphinx_mdef_convert
%{_bindir}/pocketsphinx_mdef_convert-%{version}
+ --slave %{_bindir}/pocketsphinx_mdef_convert pocketsphinx_mdef_convert
%{_bindir}/pocketsphinx_mdef_convert-%{version} \
+ --slave %{_mandir}/man1/pocketsphinx_batch.1%{ext_man}
pocketsphinx_batch.1%{ext_man}
%{_mandir}/man1/pocketsphinx_batch-%{version}.1%{ext_man} \
+ --slave %{_mandir}/man1/pocketsphinx_continuous.1%{ext_man}
pocketsphinx_continuous.1%{ext_man}
%{_mandir}/man1/pocketsphinx_continuous-%{version}.1%{ext_man} \
+ --slave %{_mandir}/man1/pocketsphinx_mdef_convert.1%{ext_man}
pocketsphinx_mdef_convert.1%{ext_man}
%{_mandir}/man1/pocketsphinx_mdef_convert-%{version}.1%{ext_man}
%postun
if [ ! -f %{_bindir}/pocketsphinx_batch ]; then
@@ -128,6 +138,9 @@
%ghost %{_sysconfdir}/alternatives/pocketsphinx_batch
%ghost %{_sysconfdir}/alternatives/pocketsphinx_continuous
%ghost %{_sysconfdir}/alternatives/pocketsphinx_mdef_convert
+%ghost %{_sysconfdir}/alternatives/pocketsphinx_batch.1%{ext_man}
+%ghost %{_sysconfdir}/alternatives/pocketsphinx_continuous.1%{ext_man}
+%ghost %{_sysconfdir}/alternatives/pocketsphinx_mdef_convert.1%{ext_man}
%{_bindir}/pocketsphinx_batch*
%{_bindir}/pocketsphinx_continuous*
%{_bindir}/pocketsphinx_mdef_convert*
@@ -141,7 +154,7 @@
%{_libdir}/libpocketsphinx.so.%{sover}*
%files devel
-%{_includedir}/%{name}/
+%{_includedir}/%{name}
%{_libdir}/*.so
%{_libdir}/pkgconfig/pocketsphinx.pc
++ use-python3.patch ++
--- /var/tmp/diff_new_pack.M9h1iN/_old 2020-03-26 23:38:09.702880929 +0100
+++ /var/tmp/diff_new_pack.M9h1iN/_new 2020-03-26 23:38:09.702880929 +0100
@@ -2,6 +2,15 @@
commit pocketsphinx for openSUSE:Factory
Hello community,
here is the log from the commit of package pocketsphinx for openSUSE:Factory
checked in at 2020-03-25 23:49:57
Comparing /work/SRC/openSUSE:Factory/pocketsphinx (Old)
and /work/SRC/openSUSE:Factory/.pocketsphinx.new.3160 (New)
Package is "pocketsphinx"
Wed Mar 25 23:49:57 2020 rev:4 rq:788308 version:0.8
Changes:
--- /work/SRC/openSUSE:Factory/pocketsphinx/pocketsphinx.changes
2019-02-28 21:45:00.301484062 +0100
+++ /work/SRC/openSUSE:Factory/.pocketsphinx.new.3160/pocketsphinx.changes
2020-03-25 23:50:56.980010190 +0100
@@ -1,0 +2,6 @@
+Wed Mar 25 17:11:32 UTC 2020 - Antonio Larrosa
+
+- Generate python3 bindings instead of python2:
+ * use-python3.patch
+
+---
New:
use-python3.patch
Other differences:
--
++ pocketsphinx.spec ++
--- /var/tmp/diff_new_pack.NmH6NE/_old 2020-03-25 23:50:58.512009785 +0100
+++ /var/tmp/diff_new_pack.NmH6NE/_new 2020-03-25 23:50:58.516009783 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pocketsphinx
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,13 +16,14 @@
#
+%define sover 1
Name: pocketsphinx
Version:0.8
Release:0
Summary:Speech recognizer library written in C
License:BSD-2-Clause
Group: Productivity/Office/Other
-Url:http://cmusphinx.sourceforge.net/wiki/download/
+URL:http://cmusphinx.sourceforge.net/wiki/download/
Source:
http://downloads.sourceforge.net/project/cmusphinx/pocketsphinx/%{version}/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM pocketsphinx-doxygen.patch -- Obtained from fedora
package (http://pkgs.fedoraproject.org/cgit/rpms/pocketsphinx.git/tree/)
Patch0: pocketsphinx-doxygen.patch
@@ -30,14 +31,15 @@
Patch1: pocketsphinx-largefile.patch
# PATCH-FIX-UPSTREAM pocketsphinx-long-utterance.patch -- Obtained from fedora
package (http://pkgs.fedoraproject.org/cgit/rpms/pocketsphinx.git/tree/)
Patch2: pocketsphinx-long-utterance.patch
+Patch3: use-python3.patch
BuildRequires: alsa-devel
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: gstreamer-devel
BuildRequires: pkgconfig
-BuildRequires: python-Cython
-BuildRequires: python-devel
-BuildRequires: python-gtk-devel
+BuildRequires: python3-Cython
+BuildRequires: python3-devel
+BuildRequires: python3-gobject
BuildRequires: sphinxbase-devel
Requires(post): update-alternatives
Requires(postun): update-alternatives
@@ -46,11 +48,11 @@
Pocketsphinx is a version of the open-source CMU Sphinx II speech
recognition system which is able to recognize speech in real-time.
-%package -n libpocketsphinx1
+%package -n libpocketsphinx%{sover}
Summary:Speech recognizer library
Group: System/Libraries
-%description -n libpocketsphinx1
+%description -n libpocketsphinx%{sover}
CMU Sphinx toolkit has a number of packages for different tasks and
applications. Pocketsphinx is a version of the open-source CMU Sphinx
II speech recognition system which is able to recognize speech in
@@ -59,7 +61,7 @@
%package devel
Summary:Development files for pocketsphinx, a speech recognizer library
Group: Development/Libraries/C and C++
-Requires: libpocketsphinx1 = %{version}
+Requires: libpocketsphinx%{sover} = %{version}
%description devel
CMU Sphinx toolkit has a number of packages for different tasks and
@@ -69,12 +71,12 @@
This is the development package for pocketsphinx.
-%package -n python2-pocketsphinx
-Summary:Python bindings for pocketsphinx
+%package -n python3-pocketsphinx
+Summary:Python3 bindings for pocketsphinx
Group: Development/Languages/Python
Requires: %{name} = %{version}
-%description -n python2-pocketsphinx
+%description -n python3-pocketsphinx
Pocketsphinx is a version of the open-source CMU Sphinx II speech
recognition system which is able to recognize speech in real-time.
@@ -85,11 +87,12 @@
%patch0
%patch1
%patch2
+%patch3 -p1
rm python/pocketsphinx.c
%build
-%configure --disable-static
-make %{?_smp_mflags}
+%configure --disable-static --with-python=%{_bindir}/python3
+%make_build
%install
%make_install
@@ -104,7 +107,7 @@
done
%check
-make check
+%make_build check
%post
update-alternatives --install %{_bindir}/pocketsphinx_batch pocketsphinx_batch
%{_bindir}/pocketsphinx_batch-%{version} 10 \
@@ -116,8 +119,8 @@
update-alternatives --remove
commit pocketsphinx for openSUSE:Factory
Hello community,
here is the log from the commit of package pocketsphinx for openSUSE:Factory
checked in at 2019-02-28 21:45:00
Comparing /work/SRC/openSUSE:Factory/pocketsphinx (Old)
and /work/SRC/openSUSE:Factory/.pocketsphinx.new.28833 (New)
Package is "pocketsphinx"
Thu Feb 28 21:45:00 2019 rev:3 rq:680128 version:0.8
Changes:
--- /work/SRC/openSUSE:Factory/pocketsphinx/pocketsphinx.changes
2019-02-26 22:22:18.026068300 +0100
+++ /work/SRC/openSUSE:Factory/.pocketsphinx.new.28833/pocketsphinx.changes
2019-02-28 21:45:00.301484062 +0100
@@ -1,0 +2,5 @@
+Wed Feb 27 10:34:40 UTC 2019 - Antonio Larrosa
+
+- Add %check section to run tests
+
+---
Other differences:
--
++ pocketsphinx.spec ++
--- /var/tmp/diff_new_pack.eCNDxW/_old 2019-02-28 21:45:01.213483672 +0100
+++ /var/tmp/diff_new_pack.eCNDxW/_new 2019-02-28 21:45:01.217483671 +0100
@@ -103,6 +103,9 @@
ln -s %{_sysconfdir}/alternatives/$binary %{buildroot}%{_bindir}/$binary
done
+%check
+make check
+
%post
update-alternatives --install %{_bindir}/pocketsphinx_batch pocketsphinx_batch
%{_bindir}/pocketsphinx_batch-%{version} 10 \
--slave %{_bindir}/pocketsphinx_continuous pocketsphinx_continuous
%{_bindir}/pocketsphinx_continuous-%{version} \
commit pocketsphinx for openSUSE:Factory
Hello community,
here is the log from the commit of package pocketsphinx for openSUSE:Factory
checked in at 2019-02-26 22:20:49
Comparing /work/SRC/openSUSE:Factory/pocketsphinx (Old)
and /work/SRC/openSUSE:Factory/.pocketsphinx.new.28833 (New)
Package is "pocketsphinx"
Tue Feb 26 22:20:49 2019 rev:2 rq:679059 version:0.8
Changes:
--- /work/SRC/openSUSE:Factory/pocketsphinx/pocketsphinx.changes
2018-08-31 10:42:17.487049528 +0200
+++ /work/SRC/openSUSE:Factory/.pocketsphinx.new.28833/pocketsphinx.changes
2019-02-26 22:22:18.026068300 +0100
@@ -1,0 +2,6 @@
+Sat Feb 23 12:38:37 UTC 2019 - alarr...@suse.com
+
+- Use alternatives for binaries to make possible to have it coinstalled
+ with pocketsphinx5 5prealpha
+
+---
Other differences:
--
++ pocketsphinx.spec ++
--- /var/tmp/diff_new_pack.JslKEE/_old 2019-02-26 22:22:18.802068025 +0100
+++ /var/tmp/diff_new_pack.JslKEE/_new 2019-02-26 22:22:18.802068025 +0100
@@ -1,7 +1,7 @@
#
# spec file for package pocketsphinx
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -35,10 +35,12 @@
BuildRequires: fdupes
BuildRequires: gstreamer-devel
BuildRequires: pkgconfig
+BuildRequires: python-Cython
BuildRequires: python-devel
BuildRequires: python-gtk-devel
-BuildRequires: python-Cython
BuildRequires: sphinxbase-devel
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
%description
Pocketsphinx is a version of the open-source CMU Sphinx II speech
@@ -94,14 +96,39 @@
%fdupes %{buildroot}
find %{buildroot} -type f -name "*.la" -delete -print
+# Prepare for alternatives
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+for binary in pocketsphinx_batch pocketsphinx_continuous
pocketsphinx_mdef_convert ; do
+mv %{buildroot}%{_bindir}/$binary %{buildroot}%{_bindir}/$binary-%{version}
+ln -s %{_sysconfdir}/alternatives/$binary %{buildroot}%{_bindir}/$binary
+done
+
+%post
+update-alternatives --install %{_bindir}/pocketsphinx_batch pocketsphinx_batch
%{_bindir}/pocketsphinx_batch-%{version} 10 \
+ --slave %{_bindir}/pocketsphinx_continuous pocketsphinx_continuous
%{_bindir}/pocketsphinx_continuous-%{version} \
+ --slave %{_bindir}/pocketsphinx_mdef_convert pocketsphinx_mdef_convert
%{_bindir}/pocketsphinx_mdef_convert-%{version}
+
+%postun
+if [ ! -f %{_bindir}/pocketsphinx_batch ]; then
+update-alternatives --remove pocketsphinx_batch
%{_bindir}/pocketsphinx_batch-%{version}
+fi
+
%post -n libpocketsphinx1 -p /sbin/ldconfig
%postun -n libpocketsphinx1 -p /sbin/ldconfig
%files
%doc AUTHORS ChangeLog README
%license COPYING
-%{_bindir}/pocketsphinx_*
-%{_datadir}/%{name}/
+%ghost %{_sysconfdir}/alternatives/pocketsphinx_batch
+%ghost %{_sysconfdir}/alternatives/pocketsphinx_continuous
+%ghost %{_sysconfdir}/alternatives/pocketsphinx_mdef_convert
+%{_bindir}/pocketsphinx_batch*
+%{_bindir}/pocketsphinx_continuous*
+%{_bindir}/pocketsphinx_mdef_convert*
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/model
+%{_datadir}/%{name}/model/hmm
+%{_datadir}/%{name}/model/lm
%{_mandir}/man1/*%{ext_man}
%files -n libpocketsphinx1
