Compare commits

...

No commits in common. 'cs10' and 'c9' have entirely different histories.
cs10 ... c9

2
.gitignore vendored

@ -1,2 +1,2 @@
SOURCES/sound-icons-0.1.tar.gz SOURCES/sound-icons-0.1.tar.gz
SOURCES/speech-dispatcher-0.11.5.tar.gz SOURCES/speech-dispatcher-0.10.2.tar.gz

@ -1,2 +1,2 @@
4d9284f88a95fac6eddb1becc8a7111589755a93 SOURCES/sound-icons-0.1.tar.gz 4d9284f88a95fac6eddb1becc8a7111589755a93 SOURCES/sound-icons-0.1.tar.gz
614c6f31872c95afadd7a847a58598a8b3d43040 SOURCES/speech-dispatcher-0.11.5.tar.gz 33da39cece3c3a502758eef6ac2147e065997a60 SOURCES/speech-dispatcher-0.10.2.tar.gz

@ -1,15 +1,28 @@
--- speech-dispatcher-0.11.1/src/api/python/speechd_config/config.py~ 2022-01-08 16:36:58.000000000 -0600 From 5ede80b0713c75b21925203c3ef389c86cb69e6d Mon Sep 17 00:00:00 2001
+++ speech-dispatcher-0.11.1/src/api/python/speechd_config/config.py 2022-01-10 10:39:08.029069754 -0600 From: Bastien Nocera <hadess@hadess.net>
@@ -29,8 +29,6 @@ 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 sys
import time import time
-from xdg import BaseDirectory -from xdg import BaseDirectory
- -
# Configuration and sound data paths # Locale/gettext configuration
from . import buildconfig
@@ -180,7 +178,16 @@ locale.setlocale(locale.LC_ALL, '')
@@ -167,7 +165,16 @@ class Tests:
def user_conf_dir(self): def user_conf_dir(self):
"""Return user configuration directory""" """Return user configuration directory"""
@ -27,3 +40,6 @@
def system_conf_dir(self): def system_conf_dir(self):
"""Determine system configuration directory""" """Determine system configuration directory"""
--
2.17.1

@ -1,47 +1,42 @@
%if 0%{?rhel} > 9 %global _hardened_build 1
%global festival_backend 0
%else
%global festival_backend 1
%endif
Name: speech-dispatcher Name: speech-dispatcher
Version: 0.11.5 Version: 0.10.2
Release: 8%{?dist} Release: 4%{?dist}
Summary: To provide a high-level device independent layer for speech synthesis Summary: To provide a high-level device independent layer for speech synthesis
# Almost all files are under GPL-2.0-or-later, however # Almost all files are under GPLv2+, however
# src/c/clients/spdsend/spdsend.h is licensed under GPLv2, # src/c/clients/spdsend/spdsend.h is licensed under GPLv2,
# which makes %%_bindir/spdsend GPLv2. # which makes %%_bindir/spdsend GPLv2.
License: GPL-2.0-or-later AND LGPL-2.1-only OR LGPL-2.0-only License: GPLv2+ and LGPLv2
URL: http://devel.freebsoft.org/speechd URL: http://devel.freebsoft.org/speechd
Source0: https://github.com/brailcom/speechd/releases/download/%{version}/speech-dispatcher-%{version}.tar.gz Source0: https://github.com/brailcom/speechd/releases/download/%{version}/speech-dispatcher-%{version}.tar.gz
Source1: http://www.freebsoft.org/pub/projects/sound-icons/sound-icons-0.1.tar.gz Source1: http://www.freebsoft.org/pub/projects/sound-icons/sound-icons-0.1.tar.gz
Patch1: 0001-Remove-pyxdg-dependency.patch Patch1: 0001-Remove-pyxdg-dependency.patch
BuildRequires: make
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: dotconf-devel BuildRequires: dotconf-devel
BuildRequires: espeak-ng-devel BuildRequires: espeak-ng-devel
%if 0%{?fedora} || 0%{?rhel} < 10 BuildRequires: flite-devel
BuildRequires: flite-devel >= 2.0
%endif
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: git-core
Buildrequires: glib2-devel Buildrequires: glib2-devel
BuildRequires: help2man
Buildrequires: intltool Buildrequires: intltool
Buildrequires: libao-devel Buildrequires: libao-devel
Buildrequires: libtool-ltdl-devel Buildrequires: libtool-ltdl-devel
Buildrequires: libsndfile-devel Buildrequires: libsndfile-devel
BuildRequires: make
Buildrequires: pulseaudio-libs-devel Buildrequires: pulseaudio-libs-devel
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-setuptools BuildRequires: python3-setuptools
BuildRequires: systemd-rpm-macros BuildRequires: systemd
BuildRequires: texinfo BuildRequires: texinfo
BuildRequires: /usr/bin/help2man
Requires: %{name}-espeak-ng%{?_isa} = %{version}-%{release} Requires: speech-dispatcher-espeak-ng
Requires(post): systemd Requires(post): systemd
Requires(preun): systemd Requires(preun): systemd
Requires(postun): systemd Requires(postun): systemd
@ -63,20 +58,10 @@ Obsoletes: speech-dispatcher-kali < 0.9.1
Speech Dispatcher rather than the TTS engine, since most engines Speech Dispatcher rather than the TTS engine, since most engines
have limited sound output capabilities. have limited sound output capabilities.
%package libs
Summary: Development files for %{name}
License: GPL-2.0-or-later
# split out of main package
Conflicts: %{name} < 0.11.5-4
%description libs
The %{name}-libs package contains runtime libraries for applications
that use %{name}.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}%{_isa} = %{version}-%{release}
License: GPL-2.0-or-later License: GPLv2+
%description devel %description devel
The %{name}-devel package contains libraries and header files for The %{name}-devel package contains libraries and header files for
@ -84,7 +69,7 @@ developing applications that use %{name}.
%package doc %package doc
Summary: Documentation for speech-dispatcher Summary: Documentation for speech-dispatcher
License: GPL-2.0-or-later License: GPLv2+
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
BuildArch: noarch BuildArch: noarch
@ -93,10 +78,9 @@ speechd documentation
%package utils %package utils
Summary: Various utilities for speech-dispatcher Summary: Various utilities for speech-dispatcher
License: GPL-2.0-or-later License: GPLv2+
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}%{_isa} = %{version}-%{release}
Requires: python3-speechd = %{version}-%{release} Requires: python3-speechd = %{version}-%{release}
Requires: pulseaudio-utils
%description utils %description utils
Various utilities for speechd Various utilities for speechd
@ -108,7 +92,6 @@ Requires: %{name}%{_isa} = %{version}-%{release}
%description espeak-ng %description espeak-ng
This package contains the espeak-ng output module for Speech Dispatcher. This package contains the espeak-ng output module for Speech Dispatcher.
%if %{festival_backend}
%package festival %package festival
Summary: Speech Dispatcher festival module Summary: Speech Dispatcher festival module
Requires: %{name}%{_isa} = %{version}-%{release} Requires: %{name}%{_isa} = %{version}-%{release}
@ -116,42 +99,34 @@ Requires: festival-freebsoft-utils
%description festival %description festival
This package contains the festival output module for Speech Dispatcher. This package contains the festival output module for Speech Dispatcher.
%endif
%if 0%{?fedora} || 0%{?rhel} < 10
%package flite %package flite
Summary: Speech Dispatcher flite module Summary: Speech Dispatcher flite module
Requires: %{name}%{_isa} = %{version}-%{release} Requires: %{name}%{_isa} = %{version}-%{release}
Requires: flite%{?_isa} >= 2.0
%description flite %description flite
This package contains the flite output module for Speech Dispatcher. This package contains the flite output module for Speech Dispatcher.
%endif
%package -n python3-speechd %package -n python3-speechd
Summary: Python 3 Client API for speech-dispatcher Summary: Python 3 Client API for speech-dispatcher
License: GPL-2.0-or-later License: GPLv2+
Requires: %{name}%{_isa} = %{version}-%{release}
%description -n python3-speechd %description -n python3-speechd
Python 3 module for speech-dispatcher Python 3 module for speech-dispatcher
%prep %prep
%autosetup -p1 %autosetup -S git
tar xf %{SOURCE1} tar xf %{SOURCE1}
%build %build
%configure --disable-static \ %configure --disable-static \
--with-alsa --with-pulse --with-libao \ --with-alsa --with-pulse --with-libao \
--with-espeak-ng \ --with-flite --with-espeak-ng \
%if 0%{?fedora} || 0%{?rhel} < 10
--with-flite \
%endif
--without-oss --without-nas --without-espeak \ --without-oss --without-nas --without-espeak \
--with-kali=no --with-baratinoo=no --with-ibmtts=no --with-voxin=no \ --with-kali=no --with-baratinoo=no --with-ibmtts=no --with-voxin=no \
--sysconfdir=%{_sysconfdir} --with-default-audio-method=pulse \ --sysconfdir=%{_sysconfdir} --with-default-audio-method=pulse
--with-module-bindir=%{_libdir}/speech-dispatcher-modules/ \
--with-systemdsystemunitdir=%{_unitdir}
%make_build %make_build
@ -183,13 +158,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/speech-dispatcher/conf/desktop/sp
# enable pulseaudio as default with a fallback to alsa # enable pulseaudio as default with a fallback to alsa
sed 's/# AudioOutputMethod "pulse,alsa"/AudioOutputMethod "pulse,alsa"/' %{buildroot}%{_sysconfdir}/speech-dispatcher/speechd.conf sed 's/# AudioOutputMethod "pulse,alsa"/AudioOutputMethod "pulse,alsa"/' %{buildroot}%{_sysconfdir}/speech-dispatcher/speechd.conf
# Remove Festival related files if needed, we can't disable their generation by any other means (e. g. configure option).
# And if not done, we're getting an error about installed but unpackaged files.
%if %{festival_backend} == 0
rm %{buildroot}%{_sysconfdir}/speech-dispatcher/modules/festival.conf
rm %{buildroot}%{_libdir}/speech-dispatcher-modules/sd_festival
%endif
%post %post
%systemd_post speech-dispatcherd.service %systemd_post speech-dispatcherd.service
@ -213,6 +181,8 @@ rm %{buildroot}%{_libdir}/speech-dispatcher-modules/sd_festival
%exclude %{_sysconfdir}/speech-dispatcher/modules/flite.conf %exclude %{_sysconfdir}/speech-dispatcher/modules/flite.conf
%{_bindir}/speech-dispatcher %{_bindir}/speech-dispatcher
%{_datadir}/speech-dispatcher/ %{_datadir}/speech-dispatcher/
%{_libdir}/libspeechd.so.2
%{_libdir}/libspeechd.so.2.6.0
%dir %{_libdir}/speech-dispatcher-modules/ %dir %{_libdir}/speech-dispatcher-modules/
%{_libdir}/speech-dispatcher-modules/sd_cicero %{_libdir}/speech-dispatcher-modules/sd_cicero
%{_libdir}/speech-dispatcher-modules/sd_dummy %{_libdir}/speech-dispatcher-modules/sd_dummy
@ -224,11 +194,6 @@ rm %{buildroot}%{_libdir}/speech-dispatcher-modules/sd_festival
%dir %attr(0700, root, root) %{_localstatedir}/log/speech-dispatcher/ %dir %attr(0700, root, root) %{_localstatedir}/log/speech-dispatcher/
%{_unitdir}/speech-dispatcherd.service %{_unitdir}/speech-dispatcherd.service
%files libs
%license COPYING.LGPL
%{_libdir}/libspeechd.so.2
%{_libdir}/libspeechd.so.2.6.0
%files devel %files devel
%{_includedir}/* %{_includedir}/*
%{_libdir}/lib*.so %{_libdir}/lib*.so
@ -247,105 +212,25 @@ rm %{buildroot}%{_libdir}/speech-dispatcher-modules/sd_festival
%files espeak-ng %files espeak-ng
%config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/espeak-ng.conf %config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/espeak-ng.conf
%{_libdir}/speech-dispatcher-modules/sd_espeak-ng %{_libdir}/speech-dispatcher-modules/sd_espeak-ng
%{_libdir}/speech-dispatcher-modules/sd_espeak-ng-mbrola
%if %{festival_backend}
%files festival %files festival
%config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/festival.conf %config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/festival.conf
%{_libdir}/speech-dispatcher-modules/sd_festival %{_libdir}/speech-dispatcher-modules/sd_festival
%endif
%if 0%{?fedora} || 0%{?rhel} < 10
%files flite %files flite
%config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/flite.conf %config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/flite.conf
%{_libdir}/speech-dispatcher-modules/sd_flite %{_libdir}/speech-dispatcher-modules/sd_flite
%endif
%files -n python3-speechd %files -n python3-speechd
%{python3_sitearch}/speechd* %{python3_sitearch}/speechd*
%changelog %changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.11.5-8 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.10.2-4
- Bump release for October 2024 mass rebuild: - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Resolves: RHEL-64018 Related: rhbz#1991688
* Mon Jul 1 2024 Lukas Tyrychtr <ltyrycht@redhat.com>
- Conditionalize the festival subpackage, we're not shipping Festival in RHEL 10
Festival in RHEL 10)
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.11.5-6
- Bump release for June 2024 mass rebuild
* Sun Apr 14 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 0.11.5-5
- Fix split -libs upgrades
* Thu Mar 21 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 0.11.5-4
- Split out libs and adjust dependencies
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jan 04 2024 Gwyn Ciesla <gwync@protonmail.com> - 0.11.5-2
- Have utils require pulseaudio-utils as it's the default.
* Mon Aug 07 2023 Gwyn Ciesla <gwync@protonmail.com> - 0.11.5-1
- 0.11.5
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 0.11.4-5
- Rebuilt for Python 3.12
* Fri May 12 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 0.11.4-4
- Disable flite in RHEL 10+ builds
* Tue Feb 28 2023 Gwyn Ciesla <gwync@protonmail.com> - 0.11.4-3
- migrated to SPDX license
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Nov 01 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.11.4-1
- 0.11.4
* Mon Sep 19 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.11.3-1
- 0.11.3
* Mon Aug 29 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.11.2-1
- 0.11.2
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.11.1-3
- Rebuilt for Python 3.11
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Jan 10 2022 Gwyn Ciesla <gwync@protonmail.com> - 0.11.1-1
- 0.11.1
* Mon Dec 13 2021 Gwyn Ciesla <gwync@protonmail.com> - 0.11.0-1
- 0.11.0
* Mon Oct 18 2021 Dominik Mierzejewski <rpm@greysector.net> - 0.10.2-7
- move the manual flite dependency to flite subpackage
* Wed Oct 06 2021 Dominik Mierzejewski <rpm@greysector.net> - 0.10.2-6
- Rebuilt for flite-2.2
- Added manual dependencies on flite 2.0+ for register_cmu_us_kal16 symbol
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.10.2-4
- Rebuilt for Python 3.10
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.10.2-3 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.10.2-3
- Rebuilt for updated systemd-rpm-macros - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
See https://pagure.io/fesco/issue/2583.
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.2-2 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save