diff --git a/0001-Make-espeak-ng-the-default-output-module.patch b/0001-Make-espeak-ng-the-default-output-module.patch deleted file mode 100644 index 1b58719..0000000 --- a/0001-Make-espeak-ng-the-default-output-module.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b4400c86b7481cd8ffd6d1ae4dc62d0be29e1e30 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= -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 - diff --git a/sources b/sources index b1f1224..1934485 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (speech-dispatcher-0.8.8.tar.gz) = 7c7b9bf9b9ce541e790b5ae396cb614616c6b3883e75c0258603e91bf679850e3d63a6251daa3a1819b30d7518e3f552c83fe87b006274ffe1aa0f7e19c0b99b +SHA512 (speech-dispatcher-0.9.0.tar.gz) = d72542531f58954e424d1cf956f6cb4fd42d585a1d4b955b13e8a426729a06407cf4085b2b4885eac110d36216c9a8403d37b401eca5c2398011786bdf041083 SHA512 (sound-icons-0.1.tar.gz) = f0ba9e1e84ace325671c7f323f01d647aa0e1a318e9adc2a6d8af4e0d795e478b2ea66007670f9c7ced9ef7310fdbccb5168b0f404579f5dff8712fe12ad93a0 diff --git a/speech-dispatcher.spec b/speech-dispatcher.spec index 43b9da9..885c6f4 100644 --- a/speech-dispatcher.spec +++ b/speech-dispatcher.spec @@ -1,24 +1,22 @@ %global _hardened_build 1 Name: speech-dispatcher -Version: 0.8.8 -Release: 8%{?dist} +Version: 0.9.0 +Release: 1%{?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 GPLv2 +License: GPLv2+ and LGPLv2 URL: http://devel.freebsoft.org/speechd 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-Make-espeak-ng-the-default-output-module.patch -Patch2: 0001-Remove-pyxdg-dependency.patch +Patch1: 0001-Remove-pyxdg-dependency.patch -BuildRequires: gcc +BuildRequires: gcc gcc-c++ BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils BuildRequires: dotconf-devel @@ -136,13 +134,10 @@ tar xf %{SOURCE1} --with-espeak-ng \ --sysconfdir=%{_sysconfdir} --with-default-audio-method=pulse -make %{?_smp_mflags} V=1 +%make_build %install -make install DESTDIR=%{buildroot} INSTALL="install -p" - -mkdir -p %{buildroot}%{_unitdir} -install -p -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/ +%make_install install -p -m 0644 sound-icons-0.1/* %{buildroot}%{_datadir}/sounds/%{name}/ @@ -213,9 +208,8 @@ if [ $1 = 0 ]; then fi %files -f speech-dispatcher.lang -%{!?_licensedir:%global license %%doc} -%license COPYING -%doc NEWS README +%license COPYING.LGPL +%doc NEWS README.md %dir %{_sysconfdir}/speech-dispatcher/ %dir %{_sysconfdir}/speech-dispatcher/clients %dir %{_sysconfdir}/speech-dispatcher/modules @@ -230,9 +224,11 @@ fi %{_libdir}/libspeechd.so.2 %{_libdir}/libspeechd.so.2.6.0 %dir %{_libdir}/speech-dispatcher-modules/ +%{_libdir}/speech-dispatcher-modules/sd_baratinoo %{_libdir}/speech-dispatcher-modules/sd_cicero %{_libdir}/speech-dispatcher-modules/sd_dummy %{_libdir}/speech-dispatcher-modules/sd_generic +%{_libdir}/speech-dispatcher-modules/sd_kali %dir %{_libdir}/speech-dispatcher %{_libdir}/speech-dispatcher/spd*.so %{_datadir}/sounds/speech-dispatcher @@ -268,8 +264,11 @@ fi %{python3_sitearch}/speechd* %changelog +* Sun Jan 27 2019 Peter Robinson 0.9.0-1 +- speech-dispatcher 0.9.0 + * Fri Jul 20 2018 Bastien Nocera - 0.8.8-8 -+ speech-dispatcher-0.8.8-8 +- speech-dispatcher-0.8.8-8 - Remove pyxdg dependency * Sat Jul 14 2018 Fedora Release Engineering - 0.8.8-7 diff --git a/speech-dispatcherd.service b/speech-dispatcherd.service deleted file mode 100644 index 2b779a5..0000000 --- a/speech-dispatcherd.service +++ /dev/null @@ -1,9 +0,0 @@ -[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