From d72c7beace3a503242c60859df5c2dee5bf12e6e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 20 Mar 2013 12:09:24 +0000 Subject: [PATCH 1/4] initial 0.8 rebase --- .gitignore | 3 +- sources | 3 +- speech-dispatcher.spec | 140 +++++++++++++++++++---------------------- 3 files changed, 70 insertions(+), 76 deletions(-) diff --git a/.gitignore b/.gitignore index e9e32f4..5c8e403 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -speech-dispatcher-0.7.1.tar.gz +/sound-icons*.tar.gz +/speech-dispatcher*.tar.gz diff --git a/sources b/sources index 1bedb96..2455b9e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -ccfc30ac006673d36b4223eb760ed696 speech-dispatcher-0.7.1.tar.gz +d88691a64c676122f996230c107c392f speech-dispatcher-0.8.tar.gz +2777d1ec18854230dce51fb75490c26e sound-icons-0.1.tar.gz diff --git a/speech-dispatcher.spec b/speech-dispatcher.spec index e8f19b9..b499ee5 100644 --- a/speech-dispatcher.spec +++ b/speech-dispatcher.spec @@ -1,9 +1,6 @@ -# sitelib for noarch packages, sitearch for others (remove the unneeded one) -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - Name: speech-dispatcher -Version: 0.7.1 -Release: 10%{?dist} +Version: 0.8 +Release: 1%{?dist} Summary: To provide a high-level device independent layer for speech synthesis Group: System Environment/Libraries @@ -11,32 +8,36 @@ Group: System Environment/Libraries # src/c/clients/spdsend/spdsend.h is licensed under GPLv2, # which makes %%_bindir/spdsend GPLv2. License: GPLv2+ and GPLv2 -URL: http://www.freebsoft.org/speechd +URL: http://devel.freebsoft.org/speechd Source0: http://www.freebsoft.org/pub/projects/speechd/%{name}-%{version}.tar.gz -Source1: speech-dispatcherd.service +Source1: http://www.freebsoft.org/pub/projects/sound-icons/sound-icons-0.1.tar.gz +Source2: speech-dispatcherd.service +Patch0: 0001-RPM-Cleanups.patch + BuildRequires: alsa-lib-devel BuildRequires: dotconf-devel BuildRequires: espeak-devel BuildRequires: flite-devel Buildrequires: glib2-devel Buildrequires: libao-devel +Buildrequires: libtool-ltdl-devel Buildrequires: pulseaudio-libs-devel -BuildRequires: python-setuptools-devel +BuildRequires: python2-devel +BuildRequires: python-setuptools +BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: texinfo -BuildRequires: systemd-units -BuildRequires: automake libtool -Patch0: 0001-RPM-Cleanups.patch - -Requires(post): systemd-units -Requires(post): systemd-sysv -Requires(post): chkconfig -Requires(preun): systemd-units -Requires(postun): systemd-units +BuildRequires: systemd +BuildRequires: automake libtool intltool %ifnarch s390 s390x BuildRequires: libraw1394 %endif +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd + Requires: festival-freebsoft-utils @@ -72,23 +73,35 @@ Group: Documentation Requires: speech-dispatcher = %{version}-%{release} Requires(post): /sbin/install-info Requires(preun):/sbin/install-info +BuildArch: noarch %description doc speechd documentation -%package python -Summary: Python Client API for speech-dispatcher +%package -n python-speechd +Summary: Python 2 Client API for speech-dispatcher +License: GPLv2+ +Group: Development/Libraries +Requires: speech-dispatcher = %{version}-%{release} +Obsoletes: speech-dispatcher-python < 0.7.1-11 +Provides: speech-dispatcher-python = %{version}-%{release} + +%description -n python-speechd +Python 2 module for speech-dispatcher + +%package -n python3-speechd +Summary: Python 3 Client API for speech-dispatcher License: GPLv2+ Group: Development/Libraries Requires: speech-dispatcher = %{version}-%{release} -%description python -speechd python module +%description -n python3-speechd +Python 3 module for speech-dispatcher %prep %setup -q -%patch0 -p1 -autoreconf -i -f +#%patch0 -p1 +#autoreconf -vif %build %configure --disable-static --with-alsa --with-pulse --without-nas --with-flite --sysconfdir=%{_sysconfdir} @@ -97,7 +110,7 @@ make %{?_smp_mflags} %install for dir in \ - config/ doc/ src/audio/ src/c/ src/modules/ src/tests/ src/server/ src/python/ + config/ doc/ src/audio/ src/api/ src/modules/ src/tests/ src/server/ do pushd $dir make install DESTDIR=%{buildroot} INSTALL="install -p" @@ -105,7 +118,7 @@ for dir in \ done mkdir -p %{buildroot}%{_unitdir} -install -p -m 0644 %SOURCE1 %{buildroot}%{_unitdir}/ +install -p -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/ #Remove %{_infodir}/dir file rm -f %{buildroot}%{_infodir}/dir @@ -113,53 +126,30 @@ rm -f %{buildroot}%{_infodir}/dir find %{buildroot} -name '*.la' -exec rm -f {} ';' # Move the config files from /usr/share to /etc -%{__mkdir} -p %{buildroot}%{_sysconfdir}/speech-dispatcher/clients -%{__mkdir} -p %{buildroot}%{_sysconfdir}/speech-dispatcher/modules +mkdir -p %{buildroot}%{_sysconfdir}/speech-dispatcher/clients +mkdir -p %{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 # Create log dir -%{__mkdir} -p -m 0700 %{buildroot}%{_localstatedir}/log/speech-dispatcher/ +mkdir -p -m 0700 %{buildroot}%{_localstatedir}/log/speech-dispatcher/ -%clean -rm -rf %{buildroot} +# enable pulseaudio as default with a fallback to alsa +sed 's/# AudioOutputMethod "pulse,alsa"/AudioOutputMethod "pulse,alsa"/' %{buildroot}%{_sysconfdir}/speech-dispatcher/speechd.conf %post /sbin/ldconfig -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post speech-dispatcherd.service %postun /sbin/ldconfig - -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart speech-dispatcherd.service >/dev/null 2>&1 || : -fi +%systemd_postun_with_restart speech-dispatcherd.service %preun -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable speech-dispatcherd.service > /dev/null 2>&1 || : - /bin/systemctl stop speech-dispatcherd.service > /dev/null 2>&1 || : -fi - -%triggerun -- speech-dispatcherd < 0.7.1-6 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply httpd -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save speech-dispatcherd >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del speech-dispatcherd >/dev/null 2>&1 || : -/bin/systemctl try-restart speech-dispatcherd.service >/dev/null 2>&1 || : +%systemd_preun speech-dispatcherd.service %files -%defattr(-,root,root,-) %doc AUTHORS ChangeLog NEWS README COPYING %dir %{_sysconfdir}/speech-dispatcher/ %dir %{_sysconfdir}/speech-dispatcher/clients @@ -169,12 +159,10 @@ fi %config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/*.conf %{_bindir}/* %{_libdir}/libspeechd.so.2 -%{_libdir}/libspeechd.so.2.3.0 +%{_libdir}/libspeechd.so.2.4.0 %{_libdir}/speech-dispatcher-modules/ %dir %{_libdir}/speech-dispatcher -%{_libdir}/speech-dispatcher/lib*.so -%{_libdir}/speech-dispatcher/libsdaudio.so.2 -%{_libdir}/speech-dispatcher/libsdaudio.so.2.0.4 +%{_libdir}/speech-dispatcher/spd*.so %{_datadir}/sounds/speech-dispatcher %dir %attr(0700, root, root) %{_localstatedir}/log/speech-dispatcher/ @@ -182,33 +170,37 @@ fi %{_unitdir}/speech-dispatcherd.service %files devel -%defattr(-,root,root,-) %{_includedir}/* %{_libdir}/lib*.so %files doc -%defattr(-,root,root,-) %{_infodir}/* %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 || : -/sbin/install-info %{_infodir}/%{name}-cs.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 || : - /sbin/install-info --delete %{_infodir}/%{name}-cs.info %{_infodir}/dir || : fi -%files python -%defattr(-,root,root,-) +%files -n python-speechd %{python_sitearch}/speechd* +%files -n python3-speechd +# %{python3_sitearch}/speechd* + %changelog +* Thu Feb 28 2013 Peter Robinson 0.8-1 +- Update to 0.8 stable release +- Rename python package for consistency +- Add python3 bindings - fixes RHBZ 867958 +- Update the systemd scriptlets to the macroized versions + * Fri Feb 15 2013 Fedora Release Engineering - 0.7.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -230,20 +222,20 @@ fi * Wed Feb 09 2011 Fedora Release Engineering - 0.7.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -* Wed Dec 8 2010 Peter Robinson - 0.7.1-3 +* Wed Dec 8 2010 Peter Robinson - 0.7.1-3 - Bump build for new dotconf -* Thu Oct 14 2010 Peter Robinson - 0.7.1-2 +* Thu Oct 14 2010 Peter Robinson - 0.7.1-2 - Depend on festival-freebsoft-utils so we work with festival -* Tue Sep 14 2010 Peter Robinson - 0.7.1-1 +* Tue Sep 14 2010 Peter Robinson - 0.7.1-1 - New upstream 0.7.1 stable release - Some spec and build cleanups -* Thu Aug 5 2010 Peter Robinson - 0.7-2 +* Thu Aug 5 2010 Peter Robinson - 0.7-2 - Disable NAS support, use PulseAudio by default -* Tue Aug 3 2010 Peter Robinson - 0.7-1 +* Tue Aug 3 2010 Peter Robinson - 0.7-1 - New upstream 0.7 stable release * Thu Jul 22 2010 David Malcolm - 0.6.7-5.1 @@ -252,16 +244,16 @@ fi * Mon Mar 08 2010 Karsten Hopp - 0.6.7-4.1 - disable libraw1394 build requirement on s390(x) -* Wed Mar 3 2010 Peter Robinson - 0.6.7-4 +* Wed Mar 3 2010 Peter Robinson - 0.6.7-4 - Add patch to fix dso linking. Bug 564851 -* Sat Jan 9 2010 Peter Robinson - 0.6.7-3 +* Sat Jan 9 2010 Peter Robinson - 0.6.7-3 - Updated to the new python sysarch spec file reqs * Sun Jul 26 2009 Fedora Release Engineering - 0.6.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Wed May 20 2009 Peter Robinson - 0.6.7-1 +* Wed May 20 2009 Peter Robinson - 0.6.7-1 - New upstream release, some spec file cleanups. * Wed Feb 25 2009 Fedora Release Engineering - 0.6.6-21 From 92d1c88398564732f65cc2f35e1d0e55999d7940 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 20 Mar 2013 13:29:19 +0000 Subject: [PATCH 2/4] Revert "Merge remote-tracking branch 'origin/f19'" This reverts commit 0c6ac1067d25149cf8480d5e2f1744f29e0393c7, reversing changes made to d72c7beace3a503242c60859df5c2dee5bf12e6e. --- speech-dispatcher.spec | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/speech-dispatcher.spec b/speech-dispatcher.spec index f0dd90e..b499ee5 100644 --- a/speech-dispatcher.spec +++ b/speech-dispatcher.spec @@ -87,17 +87,16 @@ Obsoletes: speech-dispatcher-python < 0.7.1-11 Provides: speech-dispatcher-python = %{version}-%{release} %description -n python-speechd -Python 2 bindings for speech-dispatcher. +Python 2 module for speech-dispatcher %package -n python3-speechd Summary: Python 3 Client API for speech-dispatcher License: GPLv2+ Group: Development/Libraries Requires: speech-dispatcher = %{version}-%{release} -Requires: python3-pyxdg %description -n python3-speechd -Python 3 bindings for speech-dispatcher. +Python 3 module for speech-dispatcher %prep %setup -q @@ -193,17 +192,13 @@ fi %{python_sitearch}/speechd* %files -n python3-speechd -%{python3_sitearch}/speechd* +# %{python3_sitearch}/speechd* %changelog * Thu Feb 28 2013 Peter Robinson 0.8-1 - Update to 0.8 stable release - -* Wed Feb 27 2013 Kalev Lember - 0.7.1-11 -- Rename the Python 2 package to python-speechd, for consistency with other - distros -- Backport Python 3 bindings from 0.8-beta1 and install them in python3-speechd - subpackage (#867958) +- Rename python package for consistency +- Add python3 bindings - fixes RHBZ 867958 - Update the systemd scriptlets to the macroized versions * Fri Feb 15 2013 Fedora Release Engineering - 0.7.1-10 From bde1c36aada51733f7a73c0a352520686ca73c73 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 10:28:08 -0500 Subject: [PATCH 3/4] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- speech-dispatcher.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/speech-dispatcher.spec b/speech-dispatcher.spec index b499ee5..16766d6 100644 --- a/speech-dispatcher.spec +++ b/speech-dispatcher.spec @@ -1,6 +1,6 @@ Name: speech-dispatcher Version: 0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: To provide a high-level device independent layer for speech synthesis Group: System Environment/Libraries @@ -195,6 +195,9 @@ fi # %{python3_sitearch}/speechd* %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Feb 28 2013 Peter Robinson 0.8-1 - Update to 0.8 stable release - Rename python package for consistency From 33d4983e52f984db80775d1caf4a2793ba4bd0fb Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 7 Aug 2013 08:31:22 +0100 Subject: [PATCH 4/4] Drop libao and python2 bindings --- speech-dispatcher.spec | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/speech-dispatcher.spec b/speech-dispatcher.spec index 16766d6..4e07404 100644 --- a/speech-dispatcher.spec +++ b/speech-dispatcher.spec @@ -1,6 +1,6 @@ Name: speech-dispatcher Version: 0.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: To provide a high-level device independent layer for speech synthesis Group: System Environment/Libraries @@ -22,8 +22,6 @@ Buildrequires: glib2-devel Buildrequires: libao-devel Buildrequires: libtool-ltdl-devel Buildrequires: pulseaudio-libs-devel -BuildRequires: python2-devel -BuildRequires: python-setuptools BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: texinfo @@ -39,6 +37,8 @@ Requires(preun): systemd Requires(postun): systemd Requires: festival-freebsoft-utils +Obsoletes: python-speechd +Obsoletes: speech-dispatcher-python %description @@ -78,17 +78,6 @@ BuildArch: noarch %description doc speechd documentation -%package -n python-speechd -Summary: Python 2 Client API for speech-dispatcher -License: GPLv2+ -Group: Development/Libraries -Requires: speech-dispatcher = %{version}-%{release} -Obsoletes: speech-dispatcher-python < 0.7.1-11 -Provides: speech-dispatcher-python = %{version}-%{release} - -%description -n python-speechd -Python 2 module for speech-dispatcher - %package -n python3-speechd Summary: Python 3 Client API for speech-dispatcher License: GPLv2+ @@ -106,7 +95,7 @@ Python 3 module for speech-dispatcher %build %configure --disable-static --with-alsa --with-pulse --without-nas --with-flite --sysconfdir=%{_sysconfdir} -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install for dir in \ @@ -188,13 +177,13 @@ if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/ssip.info %{_infodir}/dir || : fi -%files -n python-speechd -%{python_sitearch}/speechd* - %files -n python3-speechd -# %{python3_sitearch}/speechd* +%{python3_sitearch}/speechd* %changelog +* Wed Aug 7 2013 Peter Robinson 0.8-3 +- Drop libao and python2 bindings + * Sun Aug 04 2013 Fedora Release Engineering - 0.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild