Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -5,3 +5,6 @@ emacspeak-29.0.tar.bz2
 /emacspeak-39.0.tar.bz2
 /emacspeak-40.0.tar.bz2
 /emacspeak-45.0.tar.bz2
+/emacspeak-54.0.tar.bz2
+/emacspeak-59.0.tar.bz2
+/emacspeak-60.0.tar.bz2

emacspeak-36.0-tclsh8.4_ia32.patch

@@ -1,8 +0,0 @@
---- emacspeak-36.0/servers/32-outloud~	2012-03-21 02:29:26.000000000 +0900
-+++ emacspeak-36.0/servers/32-outloud	2012-07-30 12:33:39.103341892 +0900
-@@ -1,4 +1,4 @@
--#!/usr/bin/tclsh8.4_ia32
-+#!/usr/bin/tclsh
- # Keywords: Emacspeak, ViaVoice Outloud , TCL
- # {{{ LCD Entry: 
- 

emacspeak-38.0-espeak-libdir.patch

@@ -1,12 +0,0 @@
---- emacspeak-38.0/servers/espeak~	2013-01-19 11:11:34.000000000 +0900
-+++ emacspeak-38.0/servers/espeak	2013-10-23 18:47:39.235790079 +0900
-@@ -516,8 +516,7 @@
- if {[info exists server_p]} {
-     set tts(input) sock0
- }
--set servers [file dirname $argv0]
--set tclTTS $servers/linux-espeak
-+set tclTTS /usr/lib/emacspeak/servers/linux-espeak
- load $tclTTS/tclespeak.so
- if {[file exists /proc/asound]} {
-     set tts(play) /usr/bin/aplay

emacspeak-38.0-update-FSF-address.patch

@@ -1,48 +0,0 @@
-Index: lisp/amixer.el
-===================================================================
---- lisp/amixer.el	(revision 8448)
-+++ lisp/amixer.el	(working copy)
-@@ -19,8 +19,8 @@
- ;;; GNU General Public License for more details.
- ;;;
- ;;; You should have received a copy of the GNU General Public License
--;;; along with GNU Emacs; see the file COPYING.  If not, write to
--;;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-+;;; along with this program; if not, write to the Free Software
-+;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
- ;;}}}
- ;;{{{ introduction
-Index: lisp/cd-tool.el
-===================================================================
---- lisp/cd-tool.el	(revision 8448)
-+++ lisp/cd-tool.el	(working copy)
-@@ -19,8 +19,8 @@
- ;;; GNU General Public License for more details.
- ;;;
- ;;; You should have received a copy of the GNU General Public License
--;;; along with GNU Emacs; see the file COPYING.  If not, write to
--;;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-+;;; along with this program; if not, write to the Free Software
-+;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- 
- ;;}}}
- ;;{{{ introduction
-Index: lisp/tapestry.el
-===================================================================
---- lisp/tapestry.el	(revision 8448)
-+++ lisp/tapestry.el	(working copy)
-@@ -13,10 +13,9 @@
- ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- ;;; GNU General Public License for more details.
- ;;;
--;;; A copy of the GNU General Public License can be obtained from this
--;;; program's author (send electronic mail to kyle@uunet.uu.net) or from
--;;; the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA
--;;; 02139, USA.
-+;;; You should have received a copy of the GNU General Public License
-+;;; along with this program; if not, write to the Free Software
-+;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- ;;;
- ;;; Send bug reports to kyle@uunet.uu.net.
- 

emacspeak-Makefile-outloud.patch

@@ -1,13 +0,0 @@
---- emacspeak-45.0/Makefile~	2016-09-30 08:22:21.000000000 +0900
-+++ emacspeak-45.0/Makefile	2018-02-19 19:02:40.963500046 +0900
-@@ -256,8 +256,8 @@
- 	$(INSTALL) -d $(libdir)/phantom
- 	$(CP) -r $(PHANTOM) $(libdir)/phantom
- 	$(INSTALL) -d $(libdir)/servers
--	$(INSTALL) -d $(libdir)/servers/linux-outloud
--	$(INSTALL)  -m 755 ${OUTLOUD}  $(libdir)/servers/linux-outloud
-+#	$(INSTALL) -d $(libdir)/servers/linux-outloud
-+#	$(INSTALL)  -m 755 ${OUTLOUD}  $(libdir)/servers/linux-outloud
- 	$(INSTALL) -d $(libdir)/servers/linux-espeak
- 	$(INSTALL)  -m 755 ${ESPEAK}  $(libdir)/servers/linux-espeak
- 	$(INSTALL) -d $(libdir)/servers/software-dtk

emacspeak-tclespeak-unused-var.patch

@@ -1,11 +0,0 @@
---- emacspeak-40.0/servers/linux-espeak/tclespeak.cpp~	2013-12-04 12:10:09.000000000 +0900
-+++ emacspeak-40.0/servers/linux-espeak/tclespeak.cpp	2014-11-07 15:09:42.245472100 +0900
-@@ -180,7 +180,7 @@
- set tts(last_index) $x}");
- 
-   //>
--  return TCL_OK;
-+  return rc;
- }
- 
- int GetRate(ClientData handle, Tcl_Interp *interp, int objc,

emacspeak.spec

@@ -1,37 +1,26 @@
 Summary: Emacs Speech interface
 Name: emacspeak
-Version: 45.0
-Release: 6%{?dist}
+Version: 60.0
+Release: 3%{?dist}
 # main lisp files are GPL2+
-# lisp/atom-blogger and lisp/g-client are BSD
-License: GPLv2+ and BSD
-Source: http://emacspeak.googlecode.com/files/emacspeak-%{version}.tar.bz2
-Source10: emacspeak-filter-deps.sh
-%global __perl_requires %{SOURCE10}
+License: GPL-2.0-or-later AND BSD-3-Clause
+Source: https://github.com/tvraman/emacspeak/releases/download/%{version}/%{name}-%{version}.tar.bz2
 URL: http://emacspeak.sourceforge.net/
-Requires(post): info
-Requires(preun): info
 BuildRequires: emacs
-BuildRequires: espeak-devel
+BuildRequires: espeak-ng-devel
 BuildRequires: gcc-c++
 BuildRequires: perl-interpreter
 BuildRequires: perl-generators
 BuildRequires: texinfo
-BuildRequires: tcl-devel
+BuildRequires: tcl-devel < 1:9
+BuildRequires: make
 Requires: emacs(bin) >= %{_emacs_version}
-Requires: espeak
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: tclx
-Patch1: emacspeak-36.0-tclsh8.4_ia32.patch
-Patch3: emacspeak-38.0-espeak-libdir.patch
-Patch5: emacspeak-38.0-update-FSF-address.patch
-Patch6: emacspeak-tclespeak-unused-var.patch
-Patch7: emacspeak-Makefile-outloud.patch
 
-%description 
+%description
 Emacspeak is a speech interface that allows visually impaired users to
 interact independently and efficiently with the computer. Emacspeak has
-dramatically changed how the author and hundreds of blind and visually 
+dramatically changed how the author and hundreds of blind and visually
 impaired users around the world interact with the personal computer and
 the Internet. A rich suite of task-oriented speech-enabled tools provides
 efficient speech-enabled access to the evolving semantic WWW.
@@ -41,15 +30,6 @@ opens up the Internet to visually impaired users around the world.
 
 %prep
 %setup -q
-%patch1 -p1 -b .1-tclsh
-%patch3 -p1 -b .3-libdir
-%patch5 -p0 -b .5-fsf
-%patch6 -p1 -b .6-unused
-%patch7 -p1 -b .7-outloud
-
-for i in `find . -type f -exec grep -q /usr/bin/tcl$ '{}' ';' -print` ; do
-  sed -i -e "s%#!/usr/bin/tcl$%#!/usr/bin/tclsh\npackage require Tclx%" $i
-done
 
 chmod a-x etc/COPYRIGHT
 
@@ -57,41 +37,113 @@ chmod a-x etc/COPYRIGHT
 # use set_build_flags when available for F27 etc
 CXXFLAGS="${CXXFLAGS:-%__global_cxxflags}" ; export CXXFLAGS ; \
 LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS
-make config SRC=`pwd`
-make
-make -C servers/linux-espeak
-makeinfo -o info/ info/emacspeak.texi
+make emacspeak
+make espeak
+
 
 %install
-make install prefix=%{buildroot}%{_prefix} infodir=%{buildroot}%{_infodir}
-rm -f %{buildroot}%{_infodir}/*dir
-sed -i -e "s|%{buildroot}||g" %{buildroot}%{_bindir}/emacspeak
+mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp/emacspeak
+cp -pr bash-utils etc lisp media servers sounds stumpwm xsl %{buildroot}%{_datadir}/emacs/site-lisp/emacspeak/
 
-make -C servers/linux-espeak install LIBPARENTDIR=%{buildroot}%{_prefix}/lib
+make -C servers/native-espeak install LIBPARENTDIR=%{buildroot}%{_libdir}
+ln -sf %{_libdir}/emacspeak/servers/native-espeak/tclespeak.so %{buildroot}%{_datadir}/emacs/site-lisp/emacspeak/servers/native-espeak/
+
+mkdir -p %{buildroot}%{_bindir}
+sed -e "s/FLAVOR/emacs/" -e "s!ELCDIR!%{_datadir}/emacs/site-lisp/emacspeak!" etc/emacspeak.sh > %{buildroot}%{_bindir}/emacspeak
+chmod 0755 %{buildroot}%{_bindir}/emacspeak
+
+mkdir -p %{buildroot}%{_infodir}
+cp -p info/*.info* %{buildroot}%{_infodir}
 
 # remove unwanted data files
 ( cd %{buildroot}%{_datadir}/emacs/site-lisp/emacspeak
-  rm sounds/emacspeak.mp3
+  rm etc/bootstrap.sh
+  rm -r etc/pickup-c
   rm -r servers/*outloud*
-  rm -r servers/*dtk*
   rm servers/mac
-  rm servers/linux-espeak/{Makefile,tclespeak.cpp}
-  # zero length
-  # rpmlint complains about zero length files
-  [ -s etc/tips.html ] || rm etc/tips.html
-  find -name .nosearch -delete
+  rm servers/native-espeak/tclespeak.{cpp,o}
   rm etc/COPYRIGHT
   chmod a-x servers/.servers servers/tts-lib.tcl
+  find \( -name .nosearch -o -name Makefile \) -delete
 )
 
-%files 
-%doc etc/COPYRIGHT
+%files
+%license etc/COPYRIGHT
+%doc README*
+%{_bindir}/emacspeak
 %{_datadir}/emacs/site-lisp/emacspeak/
-%{_bindir}/*
-%{_prefix}/lib/emacspeak
+%{_libdir}/emacspeak
 %{_infodir}/*
 
+
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 60.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 60.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Tue Jan 14 2025 Jens Petersen <petersen@redhat.com> - 60.0-1
+- Update to 60.0
+- https://tvraman.github.io/emacspeak/blog/Announce-60.html
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 59.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Feb 29 2024 Parag Nemade <pnemade AT fedoraproject DOT org> - 59.0-3
+- Migrate existing license tag to SPDX expression
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 59.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Jens Petersen <petersen@redhat.com> - 59.0-1
+- update to 59.0
+- http://tvraman.github.io/emacspeak/blog/Announce-59.html
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 54.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 54.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 54.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 54.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jun 01 2022 Jitka Plesnikova <jplesnik@redhat.com> - 54.0-5
+- Perl 5.36 rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 54.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 54.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jun 29 2021 Jens Petersen <petersen@redhat.com> - 54.0-2
+- drop the dependency on espeak
+
+* Tue Jun 29 2021 Jens Petersen <petersen@redhat.com> - 54.0-1
+- update to 54
+- https://github.com/tvraman/emacspeak/blob/54.0/etc/NEWS-54.0
+- build with the espeak-ng library
+
+* Sun May 23 2021 Jitka Plesnikova <jplesnik@redhat.com> - 45.0-11
+- Perl 5.34 rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 45.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 45.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jun 25 2020 Jitka Plesnikova <jplesnik@redhat.com> - 45.0-8
+- Perl 5.32 rebuild
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 45.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 45.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (emacspeak-45.0.tar.bz2) = 38093ff4e3d954069294c3c5b794d8831baa75660b269f57febd0c338599b31292d717bedc0ec1b5b71cbd4d32a6b6cfb123441a80ab9e365b38e5c1f88c4164
+SHA512 (emacspeak-60.0.tar.bz2) = f48040f2dfaf7cb67d779d219c59477aaddb9c8b400666e5e9d9850e75575d5276f5b596ab1e8976057e5078d914a610cd537068ccc748e6c45aef64b02eaba9