Compare commits
No commits in common. "c9-beta" and "c8s" have entirely different histories.
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,2 +1,2 @@
|
||||
SOURCES/sound-icons-0.1.tar.gz
|
||||
SOURCES/speech-dispatcher-0.10.2.tar.gz
|
||||
/sound-icons*.tar.gz
|
||||
/speech-dispatcher*.tar.gz
|
||||
|
@ -1,2 +0,0 @@
|
||||
4d9284f88a95fac6eddb1becc8a7111589755a93 SOURCES/sound-icons-0.1.tar.gz
|
||||
33da39cece3c3a502758eef6ac2147e065997a60 SOURCES/speech-dispatcher-0.10.2.tar.gz
|
25
0001-Make-espeak-ng-the-default-output-module.patch
Normal file
25
0001-Make-espeak-ng-the-default-output-module.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From b4400c86b7481cd8ffd6d1ae4dc62d0be29e1e30 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
|
||||
Date: Fri, 9 Mar 2018 14:13:47 +0100
|
||||
Subject: [PATCH] Make espeak-ng the default output module
|
||||
|
||||
---
|
||||
config/speechd.conf | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/config/speechd.conf b/config/speechd.conf
|
||||
index 140de3a..f99e3ce 100644
|
||||
--- a/config/speechd.conf
|
||||
+++ b/config/speechd.conf
|
||||
@@ -240,7 +240,7 @@ DefaultVolume 100
|
||||
# The DefaultModule selects which output module is the default. You
|
||||
# must use one of the names of the modules loaded with AddModule.
|
||||
|
||||
-DefaultModule espeak
|
||||
+DefaultModule espeak-ng
|
||||
|
||||
# The LanguageDefaultModule selects which output modules are prefered
|
||||
# for specified languages.
|
||||
--
|
||||
2.14.3
|
||||
|
@ -1,45 +0,0 @@
|
||||
From 5ede80b0713c75b21925203c3ef389c86cb69e6d Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Fri, 20 Jul 2018 15:04:48 +0200
|
||||
Subject: [PATCH] Remove pyxdg dependency
|
||||
|
||||
And use the same algorithm as GLib to determine the base user config
|
||||
directory (XDG_CONFIG_HOME, then ~/.config then /tmp/$USERNAME/.config)
|
||||
---
|
||||
src/api/python/speechd_config/config.py.in | 13 ++++++++++---
|
||||
1 file changed, 10 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/api/python/speechd_config/config.py.in b/src/api/python/speechd_config/config.py.in
|
||||
index ccf8803..e8393e5 100644
|
||||
--- a/src/api/python/speechd_config/config.py.in
|
||||
+++ b/src/api/python/speechd_config/config.py.in
|
||||
@@ -30,8 +30,6 @@ import socket
|
||||
import sys
|
||||
import time
|
||||
|
||||
-from xdg import BaseDirectory
|
||||
-
|
||||
# Locale/gettext configuration
|
||||
|
||||
locale.setlocale(locale.LC_ALL, '')
|
||||
@@ -167,7 +165,16 @@ class Tests:
|
||||
|
||||
def user_conf_dir(self):
|
||||
"""Return user configuration directory"""
|
||||
- return os.path.join(BaseDirectory.xdg_config_home, "speech-dispatcher")
|
||||
+ config_dir = os.environ['XDG_CONFIG_HOME']
|
||||
+ if not config_dir:
|
||||
+ home_dir = os.environ['HOME']
|
||||
+ if home_dir:
|
||||
+ config_dir = os.path.join(home_dir, ".config")
|
||||
+ else:
|
||||
+ tmpdir = os.environ['TMPDIR'] or "/tmp/"
|
||||
+ config_dir = os.path.join(tmpdir, os.getlogin(), ".config")
|
||||
+
|
||||
+ return os.path.join(config_dir, "speech-dispatcher")
|
||||
|
||||
def system_conf_dir(self):
|
||||
"""Determine system configuration directory"""
|
||||
--
|
||||
2.17.1
|
||||
|
7
gating.yaml
Normal file
7
gating.yaml
Normal file
@ -0,0 +1,7 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-8
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
# - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||
- !PassingTestCaseRule {test_case_name: manual.sst_desktop.speech-dispatcher.sanity}
|
2
sources
Normal file
2
sources
Normal file
@ -0,0 +1,2 @@
|
||||
SHA512 (speech-dispatcher-0.8.8.tar.gz) = 7c7b9bf9b9ce541e790b5ae396cb614616c6b3883e75c0258603e91bf679850e3d63a6251daa3a1819b30d7518e3f552c83fe87b006274ffe1aa0f7e19c0b99b
|
||||
SHA512 (sound-icons-0.1.tar.gz) = f0ba9e1e84ace325671c7f323f01d647aa0e1a318e9adc2a6d8af4e0d795e478b2ea66007670f9c7ced9ef7310fdbccb5168b0f404579f5dff8712fe12ad93a0
|
@ -1,29 +1,27 @@
|
||||
%global _hardened_build 1
|
||||
|
||||
Name: speech-dispatcher
|
||||
Version: 0.10.2
|
||||
Release: 4%{?dist}
|
||||
Version: 0.8.8
|
||||
Release: 6%{?dist}
|
||||
Summary: To provide a high-level device independent layer for speech synthesis
|
||||
Group: System Environment/Libraries
|
||||
|
||||
# Almost all files are under GPLv2+, however
|
||||
# src/c/clients/spdsend/spdsend.h is licensed under GPLv2,
|
||||
# which makes %%_bindir/spdsend GPLv2.
|
||||
License: GPLv2+ and LGPLv2
|
||||
License: GPLv2+ and GPLv2
|
||||
URL: http://devel.freebsoft.org/speechd
|
||||
Source0: https://github.com/brailcom/speechd/releases/download/%{version}/speech-dispatcher-%{version}.tar.gz
|
||||
Source0: http://www.freebsoft.org/pub/projects/speechd/%{name}-%{version}.tar.gz
|
||||
Source1: http://www.freebsoft.org/pub/projects/sound-icons/sound-icons-0.1.tar.gz
|
||||
Source2: speech-dispatcherd.service
|
||||
|
||||
Patch1: 0001-Remove-pyxdg-dependency.patch
|
||||
Patch1: 0001-Make-espeak-ng-the-default-output-module.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: dotconf-devel
|
||||
BuildRequires: espeak-ng-devel
|
||||
BuildRequires: flite-devel
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: git-core
|
||||
Buildrequires: glib2-devel
|
||||
Buildrequires: intltool
|
||||
Buildrequires: libao-devel
|
||||
@ -32,16 +30,13 @@ Buildrequires: libsndfile-devel
|
||||
Buildrequires: pulseaudio-libs-devel
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: systemd
|
||||
BuildRequires: texinfo
|
||||
BuildRequires: /usr/bin/help2man
|
||||
BuildRequires: systemd
|
||||
|
||||
Requires: speech-dispatcher-espeak-ng
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
Obsoletes: speech-dispatcher-baratinoo < 0.9.1
|
||||
Obsoletes: speech-dispatcher-kali < 0.9.1
|
||||
|
||||
%description
|
||||
* Common interface to different TTS engines
|
||||
@ -60,6 +55,7 @@ Obsoletes: speech-dispatcher-kali < 0.9.1
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}%{_isa} = %{version}-%{release}
|
||||
License: GPLv2+
|
||||
|
||||
@ -70,7 +66,10 @@ developing applications that use %{name}.
|
||||
%package doc
|
||||
Summary: Documentation for speech-dispatcher
|
||||
License: GPLv2+
|
||||
Group: Documentation
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires(post): /sbin/install-info
|
||||
Requires(preun):/sbin/install-info
|
||||
BuildArch: noarch
|
||||
|
||||
%description doc
|
||||
@ -79,6 +78,7 @@ speechd documentation
|
||||
%package utils
|
||||
Summary: Various utilities for speech-dispatcher
|
||||
License: GPLv2+
|
||||
Group: Applications/System
|
||||
Requires: %{name}%{_isa} = %{version}-%{release}
|
||||
Requires: python3-speechd = %{version}-%{release}
|
||||
|
||||
@ -88,6 +88,7 @@ Various utilities for speechd
|
||||
%package espeak-ng
|
||||
Summary: Speech Dispatcher espeak-ng module
|
||||
Requires: %{name}%{_isa} = %{version}-%{release}
|
||||
Obsoletes: speech-dispatcher-espeak < 0.8.8-5
|
||||
|
||||
%description espeak-ng
|
||||
This package contains the espeak-ng output module for Speech Dispatcher.
|
||||
@ -96,6 +97,7 @@ This package contains the espeak-ng output module for Speech Dispatcher.
|
||||
Summary: Speech Dispatcher festival module
|
||||
Requires: %{name}%{_isa} = %{version}-%{release}
|
||||
Requires: festival-freebsoft-utils
|
||||
Obsoletes: speech-dispatcher < 0.8.1-2
|
||||
|
||||
%description festival
|
||||
This package contains the festival output module for Speech Dispatcher.
|
||||
@ -103,6 +105,7 @@ This package contains the festival output module for Speech Dispatcher.
|
||||
%package flite
|
||||
Summary: Speech Dispatcher flite module
|
||||
Requires: %{name}%{_isa} = %{version}-%{release}
|
||||
Obsoletes: speech-dispatcher < 0.8.1-2
|
||||
|
||||
%description flite
|
||||
This package contains the flite output module for Speech Dispatcher.
|
||||
@ -110,28 +113,35 @@ This package contains the flite output module for Speech Dispatcher.
|
||||
%package -n python3-speechd
|
||||
Summary: Python 3 Client API for speech-dispatcher
|
||||
License: GPLv2+
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}%{_isa} = %{version}-%{release}
|
||||
Requires: python3-pyxdg
|
||||
|
||||
%description -n python3-speechd
|
||||
Python 3 module for speech-dispatcher
|
||||
|
||||
%prep
|
||||
%autosetup -S git
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
|
||||
tar xf %{SOURCE1}
|
||||
|
||||
%build
|
||||
%configure --disable-static \
|
||||
--with-alsa --with-pulse --with-libao \
|
||||
--with-flite --with-espeak-ng \
|
||||
--without-oss --without-nas --without-espeak \
|
||||
--with-kali=no --with-baratinoo=no --with-ibmtts=no --with-voxin=no \
|
||||
--without-oss --without-nas \
|
||||
--with-flite \
|
||||
--without-espeak \
|
||||
--with-espeak-ng \
|
||||
--sysconfdir=%{_sysconfdir} --with-default-audio-method=pulse
|
||||
|
||||
%make_build
|
||||
make %{?_smp_mflags} V=1
|
||||
|
||||
%install
|
||||
%make_install
|
||||
make install DESTDIR=%{buildroot} INSTALL="install -p"
|
||||
|
||||
mkdir -p %{buildroot}%{_unitdir}
|
||||
install -p -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/
|
||||
|
||||
install -p -m 0644 sound-icons-0.1/* %{buildroot}%{_datadir}/sounds/%{name}/
|
||||
|
||||
@ -158,18 +168,53 @@ desktop-file-validate %{buildroot}/%{_datadir}/speech-dispatcher/conf/desktop/sp
|
||||
# enable pulseaudio as default with a fallback to alsa
|
||||
sed 's/# AudioOutputMethod "pulse,alsa"/AudioOutputMethod "pulse,alsa"/' %{buildroot}%{_sysconfdir}/speech-dispatcher/speechd.conf
|
||||
|
||||
%if 0%{?fedora}
|
||||
%pre espeak-ng
|
||||
espeak_ng_conf=%{_sysconfdir}/speech-dispatcher/modules/espeak-ng.conf
|
||||
if [ 0$1 -eq 1 -a ! -f $espeak_ng_conf ]; then
|
||||
espeak_conf=%{_sysconfdir}/speech-dispatcher/modules/espeak.conf
|
||||
if [ -f $espeak_conf ]; then
|
||||
cp $espeak_conf $espeak_ng_conf || :
|
||||
fi
|
||||
speechd_conf=%{_sysconfdir}/speech-dispatcher/speechd.conf
|
||||
if [ -f $speechd_conf ]; then
|
||||
sed -i.bak-espeak -r \
|
||||
-e 's/^(\s*AddModule\s+)("?)espeak\2\s+("?)sd_espeak\3\s+("?)espeak.conf\4(\s*(#.*)?)$/\1"espeak-ng" "sd_espeak-ng" "espeak-ng.conf"\5/' \
|
||||
-e 's/^(\s*AddModule\s+("?)[^"]*\2\s+)("?)sd_espeak\3(\s+("?)[^"]*\5(\s*(#.*)?))$/\1"sd_espeak-ng"\4/' \
|
||||
-e 's/^(\s*DefaultModule\s+)("?)espeak\2(\s*(#.*)?)$/\1espeak-ng\3/' \
|
||||
-e 's/^(\s*LanguageDefaultModule\s+("?)[^"]*\2\s+)("?)espeak\3(\s*(#.*)?)$/\1"espeak-ng"\4/' \
|
||||
$speechd_conf || :
|
||||
fi
|
||||
fi
|
||||
%endif
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
%systemd_post speech-dispatcherd.service
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%systemd_postun_with_restart speech-dispatcherd.service
|
||||
|
||||
%preun
|
||||
%systemd_preun speech-dispatcherd.service
|
||||
|
||||
%post doc
|
||||
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
|
||||
/sbin/install-info %{_infodir}/spd-say.info %{_infodir}/dir || :
|
||||
/sbin/install-info %{_infodir}/ssip.info %{_infodir}/dir || :
|
||||
|
||||
%preun doc
|
||||
if [ $1 = 0 ]; then
|
||||
/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
|
||||
/sbin/install-info --delete %{_infodir}/spd-say.info %{_infodir}/dir || :
|
||||
/sbin/install-info --delete %{_infodir}/ssip.info %{_infodir}/dir || :
|
||||
fi
|
||||
|
||||
%files -f speech-dispatcher.lang
|
||||
%license COPYING.LGPL
|
||||
%doc NEWS README.md
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license COPYING
|
||||
%doc NEWS README
|
||||
%dir %{_sysconfdir}/speech-dispatcher/
|
||||
%dir %{_sysconfdir}/speech-dispatcher/clients
|
||||
%dir %{_sysconfdir}/speech-dispatcher/modules
|
||||
@ -190,7 +235,6 @@ sed 's/# AudioOutputMethod "pulse,alsa"/AudioOutputMethod "pulse,alsa"/' %{build
|
||||
%dir %{_libdir}/speech-dispatcher
|
||||
%{_libdir}/speech-dispatcher/spd*.so
|
||||
%{_datadir}/sounds/speech-dispatcher
|
||||
%{_mandir}/man1/speech-dispatcher.1*
|
||||
%dir %attr(0700, root, root) %{_localstatedir}/log/speech-dispatcher/
|
||||
%{_unitdir}/speech-dispatcherd.service
|
||||
|
||||
@ -206,8 +250,6 @@ sed 's/# AudioOutputMethod "pulse,alsa"/AudioOutputMethod "pulse,alsa"/' %{build
|
||||
%{_bindir}/spd-conf
|
||||
%{_bindir}/spd-say
|
||||
%{_bindir}/spdsend
|
||||
%{_mandir}/man1/spd-conf.1*
|
||||
%{_mandir}/man1/spd-say.1*
|
||||
|
||||
%files espeak-ng
|
||||
%config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/espeak-ng.conf
|
||||
@ -225,73 +267,6 @@ sed 's/# AudioOutputMethod "pulse,alsa"/AudioOutputMethod "pulse,alsa"/' %{build
|
||||
%{python3_sitearch}/speechd*
|
||||
|
||||
%changelog
|
||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.10.2-4
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.10.2-3
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Nov 25 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 0.10.2-1
|
||||
- Update to 0.10.2
|
||||
|
||||
* Fri Sep 11 2020 Kalev Lember <klember@redhat.com> - 0.10.1-2
|
||||
- Fix crash with python 3.9 (#1878276)
|
||||
|
||||
* Mon Aug 10 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 0.10.1-1
|
||||
- Update to 0.10.1
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.9.1-7
|
||||
- Rebuilt for Python 3.9
|
||||
|
||||
* Tue Feb 25 2020 Than Ngo <than@redhat.com> - 0.9.1-6
|
||||
- Fixed FTBFS
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.9.1-4
|
||||
- Rebuilt for Python 3.8.0rc1 (#1748018)
|
||||
|
||||
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.9.1-3
|
||||
- Rebuilt for Python 3.8
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri May 10 2019 Peter Robinson <pbrobinson@fedoraproject.org> 0.9.1-1
|
||||
- speech-dispatcher 0.9.1
|
||||
|
||||
* Tue Feb 12 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.9.0-4
|
||||
- Remove obsolete scriptlets
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Jan 29 2019 Kalev Lember <klember@redhat.com> - 0.9.0-2
|
||||
- Split new baratinoo and kali modules out into separate subpackages
|
||||
- Install man pages
|
||||
- Update the source URL
|
||||
|
||||
* Sun Jan 27 2019 Peter Robinson <pbrobinson@fedoraproject.org> 0.9.0-1
|
||||
- speech-dispatcher 0.9.0
|
||||
|
||||
* Fri Jul 20 2018 Bastien Nocera <bnocera@redhat.com> - 0.8.8-8
|
||||
- speech-dispatcher-0.8.8-8
|
||||
- Remove pyxdg dependency
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.8-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.8.8-6
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
* Thu Mar 08 2018 Ondřej Lysoněk <olysonek@redhat.com> - 0.8.8-5
|
||||
- Make espeak-ng the default output module, drop the espeak output module
|
||||
|
9
speech-dispatcherd.service
Normal file
9
speech-dispatcherd.service
Normal file
@ -0,0 +1,9 @@
|
||||
[Unit]
|
||||
Description=Speech-Dispatcher an high-level device independent layer for speech synthesis.
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
ExecStart=/usr/bin/speech-dispatcher -d
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
Loading…
Reference in New Issue
Block a user