diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..0a80fdce31f59c062e2abba28776e9521eddff30 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..2bb0c0d1480196e19bfc2f758ee1046b660c5dc1 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/speech-dispatcher diff --git a/sound-icons-0.1.tar.gz b/sound-icons-0.1.tar.gz index 1bb463e29a2718bed40188bbe7fec15420107a91..f45d1228a87e9e8257bb9377bf40df744087432c 100644 Binary files a/sound-icons-0.1.tar.gz and b/sound-icons-0.1.tar.gz differ diff --git a/speech-dispatcher-0.11.5.tar.gz b/speech-dispatcher-0.11.5.tar.gz deleted file mode 100644 index de42af08df8ae8dcd0e2a4a32daf215f3191f024..0000000000000000000000000000000000000000 Binary files a/speech-dispatcher-0.11.5.tar.gz and /dev/null differ diff --git a/speech-dispatcher-0.12.0.tar.gz b/speech-dispatcher-0.12.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8fbe4b7c3eae9685d3deb367a5756283385ec5f2 --- /dev/null +++ b/speech-dispatcher-0.12.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1dd0bfa24b8338545e165451330adf51c4c0dca862b1b67e76fba5142dbbb74 +size 7481967 diff --git a/speech-dispatcher.spec b/speech-dispatcher.spec index 140de47f655b2d52ca760275959741fab2595366..a576ccfacba146788447f39198d4c76b1114e516 100644 --- a/speech-dispatcher.spec +++ b/speech-dispatcher.spec @@ -1,24 +1,34 @@ Name: speech-dispatcher -Version: 0.11.5 -Release: 2 +Version: 0.12.0 +Release: 1 Summary: Common high-level interface to speech synthesis License: GPL-2.0-or-later and LGPL-2.1-only or LGPL-2.0-only -URL: http://devel.freebsoft.org/speechd +URL: https://devel.freebsoft.org/speechd 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 Patch0001: 0001-Remove-pyxdg-dependency.patch -BuildRequires: alsa-lib-devel desktop-file-utils dotconf-devel espeak-ng-devel flite-devel -BuildRequires: glib2-devel intltool libao-devel libtool-ltdl-devel libsndfile-devel -BuildRequires: pulseaudio-libs-devel python3-devel python3-setuptools texinfo systemd gcc gcc-c++ make -BuildRequires: chrpath +BuildRequires: gcc make gettext +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(ao) +BuildRequires: pkgconfig(dotconf) >= 1.3 +BuildRequires: pkgconfig(espeak-ng) +BuildRequires: pkgconfig(glib-2.0) >= 2.36 +BuildRequires: pkgconfig(gmodule-2.0) +BuildRequires: pkgconfig(gthread-2.0) +BuildRequires: pkgconfig(libpipewire-0.3) +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(sndfile) >= 1.0.2 +BuildRequires: flite-devel +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: /usr/bin/desktop-file-validate Provides: speech-dispatcher-utils = %{version}-%{release} Obsoletes: speech-dispatcher-utils < %{version}-%{release} Requires: python3-speechd = %{version}-%{release} speech-dispatcher-espeak-ng -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%{?systemd_requires} %description Speech Dispatcher project provides a high-level device independent layer for @@ -26,7 +36,7 @@ access to speech synthesis through a simple, stable and well documented interfac %package devel Summary: Development files for speech-dispatcher -License: GPLv2+ +License: GPL-2.0-or-later Requires: speech-dispatcher = %{version}-%{release} %description devel @@ -35,10 +45,8 @@ use speech-dispatcher. %package help Summary: Documentation for speech-dispatcher -License: GPLv2+ +License: GPL-2.0-or-later Requires: speech-dispatcher = %{version}-%{release} -Requires(post): info -Requires(preun):info Provides: speech-dispatcher-doc = %{version}-%{release} Obsoletes: speech-dispatcher-doc < %{version}-%{release} BuildArch: noarch @@ -72,7 +80,7 @@ This package contains the flite output module for Speech Dispatcher. %package -n python3-speechd Summary: Python v3 Client API for speech-dispatcher -License: GPLv2+ +License: GPL-2.0-or-later Requires: speech-dispatcher = %{version}-%{release} %description -n python3-speechd @@ -83,28 +91,44 @@ Python v3 module for speech-dispatcher tar xf %{SOURCE1} %build -%configure --with-alsa --with-pulse --with-libao --without-oss --without-nas --with-flite --without-espeak \ - --with-espeak-ng --sysconfdir=%{_sysconfdir} --with-default-audio-method=pulse \ - --with-kali=no --with-baratinoo=no --with-voxin=no --with-ibmtts=no --disable-static \ - --with-module-bindir=%{_libdir}/speech-dispatcher-modules/ - -%make_build V=1 +%configure \ + --disable-static \ + --with-pipewire \ + --with-alsa \ + --with-pulse \ + --with-libao \ + --without-oss \ + --without-nas \ + --with-flite \ + --without-espeak \ + --with-espeak-ng \ + --sysconfdir=%{_sysconfdir} \ + --with-default-audio-method=pulse \ + --with-kali=no \ + --with-baratinoo=no \ + --with-voxin=no \ + --with-ibmtts=no \ + --with-module-bindir=%{_libdir}/speech-dispatcher-modules/ + +%make_build %install %make_install install -d %{buildroot}%{_unitdir} install -p -m 0644 sound-icons-0.1/* %{buildroot}%{_datadir}/sounds/speech-dispatcher/ %find_lang speech-dispatcher -%delete_la_and_a +%delete_la install -d %{buildroot}%{_sysconfdir}/speech-dispatcher/clients install -d %{buildroot}%{_sysconfdir}/speech-dispatcher/modules mv %{buildroot}%{_datadir}/speech-dispatcher/conf/speechd.conf %{buildroot}%{_sysconfdir}/speech-dispatcher/ mv %{buildroot}%{_datadir}/speech-dispatcher/conf/clients/* %{buildroot}%{_sysconfdir}/speech-dispatcher/clients mv %{buildroot}%{_datadir}/speech-dispatcher/conf/modules/* %{buildroot}%{_sysconfdir}/speech-dispatcher/modules install -d -m 0700 %{buildroot}%{_localstatedir}/log/speech-dispatcher/ +sed 's/^# AudioOutputMethod "pipewire"/AudioOutputMethod "pulse"/' %{buildroot}%{_sysconfdir}/speech-dispatcher/speechd.conf + +%check desktop-file-validate %{buildroot}/%{_datadir}/speech-dispatcher/conf/desktop/speechd.desktop -sed 's/# AudioOutputMethod "pulse,alsa"/AudioOutputMethod "pulse,alsa"/' %{buildroot}%{_sysconfdir}/speech-dispatcher/speechd.conf -chrpath -d %{buildroot}/%{_bindir}/spd-say + %pre espeak-ng espeak_ng_conf=%{_sysconfdir}/speech-dispatcher/modules/espeak-ng.conf if [ 0$1 -eq 1 -a ! -f $espeak_ng_conf ]; then @@ -122,24 +146,15 @@ if [ 0$1 -eq 1 -a ! -f $espeak_ng_conf ]; then $speechd_conf || : fi fi + %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 help -/sbin/install-info %{_infodir}/speech-dispatcher.info %{_infodir}/dir || : -/sbin/install-info %{_infodir}/spd-say.info %{_infodir}/dir || : -/sbin/install-info %{_infodir}/ssip.info %{_infodir}/dir || : -%preun help -if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/speech-dispatcher.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 @@ -150,14 +165,21 @@ fi %config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/*.conf %exclude %{_sysconfdir}/speech-dispatcher/modules/{espeak*.conf,festival.conf,flite.conf} %{_bindir}/speech-dispatcher -%{_datadir}/speech-dispatcher/ -%{_libdir}/{libspeechd.so.2,libspeechd.so.2.6.0} -%{_libdir}/speech-dispatcher-modules/{sd_cicero,sd_dummy,sd_generic} -%{_libdir}/speech-dispatcher/spd*.so +%{_datadir}/speech-dispatcher +%{_libdir}/libspeechd.so.2 +%{_libdir}/libspeechd.so.2.* +%{_libdir}/libspeechd_module.so.* +%{_libdir}/speech-dispatcher-modules/sd_cicero +%{_libdir}/speech-dispatcher-modules/sd_dummy +%{_libdir}/speech-dispatcher-modules/sd_generic +%{_libdir}/speech-dispatcher-modules/sd_openjtalk +%{_libdir}/speech-dispatcher/*.so %{_datadir}/sounds/speech-dispatcher %dir %attr(0700, root, root) %{_localstatedir}/log/speech-dispatcher/ %{_unitdir}/speech-dispatcherd.service %{_bindir}/{spd-conf,spd-say,spdsend} +%{_userunitdir}/speech-dispatcher.service +%{_userunitdir}/speech-dispatcher.socket %files devel %{_includedir}/* @@ -166,7 +188,6 @@ fi %files help %{_infodir}/* -%exclude %{_infodir}/dir %files espeak-ng %config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/espeak-ng.conf @@ -185,6 +206,9 @@ fi %{python3_sitearch}/speechd* %changelog +* Fri Feb 28 2025 Funda Wang - 0.12.0-1 +- update to 0.12.0 + * Tue Aug 13 2024 yaoxin - 0.11.5-2 - Remove rpath diff --git a/speech-dispatcher.yaml b/speech-dispatcher.yaml index fd7da30c7a0d4cedcb022ad782a3781d68791e8e..0b6af01db8c815afe56a362e164b6396339447bf 100644 --- a/speech-dispatcher.yaml +++ b/speech-dispatcher.yaml @@ -1,4 +1,4 @@ version_control: github src_repo: brailcom/speechd -tag_prefix: ^ -seperator: . +tag_prefix: +separator: .