From a27642dbe50074793bf22282c981a458be7c2cf7 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Wed, 28 Feb 2024 23:22:08 +0100 Subject: [PATCH] fix requirements for /usr/local/bin/perl [release 59.0-2mamba;Wed Feb 28 2024] --- emacspeak-30.0-no_install_info.patch | 19 ------ emacspeak-30.0-python.patch | 9 --- emacspeak-30.0-tclsh.patch | 93 ---------------------------- emacspeak.spec | 61 +++--------------- 4 files changed, 10 insertions(+), 172 deletions(-) delete mode 100644 emacspeak-30.0-no_install_info.patch delete mode 100644 emacspeak-30.0-python.patch delete mode 100644 emacspeak-30.0-tclsh.patch diff --git a/emacspeak-30.0-no_install_info.patch b/emacspeak-30.0-no_install_info.patch deleted file mode 100644 index 772c0fb..0000000 --- a/emacspeak-30.0-no_install_info.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nru emacspeak-30.0.orig/info/Makefile emacspeak-30.0/info/Makefile ---- emacspeak-30.0.orig/info/Makefile 2008-12-08 23:32:59.000000000 +0100 -+++ emacspeak-30.0/info/Makefile 2009-09-22 21:40:48.406356391 +0200 -@@ -27,15 +27,9 @@ - $(EMACS) -batch -q -l ../utils/document-commands.el - - install: emacspeak.info -- if test -x /sbin/install-info ; then \ -- install-info emacspeak.info /etc/info-dir; \ -- fi - $(INSTALL) -m 644 *.info* $(infodir) - - uninstall: -- if test -e /sbin/install-info ; then \ -- install-info --delete $(infodir)/*.info /etc/info-dir; \ -- fi - rm -f $(infodir)/*.info* - emacspeak.info: emacspeak.texi - diff --git a/emacspeak-30.0-python.patch b/emacspeak-30.0-python.patch deleted file mode 100644 index 8eefe56..0000000 --- a/emacspeak-30.0-python.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Nru emacspeak-30.0.orig/servers/python/HTTPSpeaker.py emacspeak-30.0/servers/python/HTTPSpeaker.py ---- emacspeak-30.0.orig/servers/python/HTTPSpeaker.py 2008-10-03 02:43:50.000000000 +0200 -+++ emacspeak-30.0/servers/python/HTTPSpeaker.py 2009-09-22 21:59:17.500356499 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - """HTTP wrapper around Emacspeak speech server. - diff --git a/emacspeak-30.0-tclsh.patch b/emacspeak-30.0-tclsh.patch deleted file mode 100644 index a4339fd..0000000 --- a/emacspeak-30.0-tclsh.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff -Nru emacspeak-30.0.orig/sawfish/tts.jl emacspeak-30.0/sawfish/tts.jl ---- emacspeak-30.0.orig/sawfish/tts.jl 2008-10-03 02:43:53.000000000 +0200 -+++ emacspeak-30.0/sawfish/tts.jl 2009-09-22 21:55:46.155356981 +0200 -@@ -77,7 +77,7 @@ - (start-process tts-process tts-client tts-host - tts-port)) - --(defvar tts-tcl "/usr/bin/tcl" -+(defvar tts-tcl "/usr/bin/tclsh" - "TCL interpreter") - - (defvar tts-dtk -diff -Nru emacspeak-30.0.orig/servers/dtk-exp emacspeak-30.0/servers/dtk-exp ---- emacspeak-30.0.orig/servers/dtk-exp 2008-10-03 02:43:51.000000000 +0200 -+++ emacspeak-30.0/servers/dtk-exp 2009-09-22 21:56:40.843606312 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/tcl -+#!/usr/bin/tclsh - # $Id: dtk-exp 5528 2008-03-15 02:06:50Z tv.raman.tv $ - # Description: Interfacing to a Dectalk via TCL. - # Keywords: Emacspeak, Dectalk, TCL -diff -Nru emacspeak-30.0.orig/servers/dtk-soft emacspeak-30.0/servers/dtk-soft ---- emacspeak-30.0.orig/servers/dtk-soft 2008-10-03 02:43:51.000000000 +0200 -+++ emacspeak-30.0/servers/dtk-soft 2009-09-22 21:56:45.651606389 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/tcl -+#!/usr/bin/tclsh - # Keywords: Emacspeak, Software Dectalk , TCL - # {{{ LCD Entry: - -diff -Nru emacspeak-30.0.orig/servers/espeak emacspeak-30.0/servers/espeak ---- emacspeak-30.0.orig/servers/espeak 2008-10-03 02:43:51.000000000 +0200 -+++ emacspeak-30.0/servers/espeak 2009-09-22 21:56:50.564356587 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/tcl -+#!/usr/bin/tclsh - # Keywords: Emacspeak, eSpeak , TCL - # {{{ LCD Entry: - -diff -Nru emacspeak-30.0.orig/servers/outloud emacspeak-30.0/servers/outloud ---- emacspeak-30.0.orig/servers/outloud 2008-10-03 02:43:51.000000000 +0200 -+++ emacspeak-30.0/servers/outloud 2009-09-22 21:56:55.596356226 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/tcl -+#!/usr/bin/tclsh - # Keywords: Emacspeak, ViaVoice Outloud , TCL - # {{{ LCD Entry: - -diff -Nru emacspeak-30.0.orig/servers/speech-server emacspeak-30.0/servers/speech-server ---- emacspeak-30.0.orig/servers/speech-server 2008-10-03 02:43:51.000000000 +0200 -+++ emacspeak-30.0/servers/speech-server 2009-09-22 21:57:00.539381225 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/tcl -+#!/usr/bin/tclsh - # $Id: speech-server 4725 2007-07-02 02:12:26Z tv.raman.tv $ - # Description: Speech server - #Usage: tcl speech-server port device-specific-script -diff -Nru emacspeak-30.0.orig/servers/ssh-dtk-exp emacspeak-30.0/servers/ssh-dtk-exp ---- emacspeak-30.0.orig/servers/ssh-dtk-exp 2008-10-03 02:43:51.000000000 +0200 -+++ emacspeak-30.0/servers/ssh-dtk-exp 2009-09-22 21:57:45.190605920 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/tcl -+#!/usr/bin/tclsh - #$Id: ssh-dtk-exp 5701 2008-07-20 17:51:31Z tv.raman.tv $ - #Description: Launch a TTS server on a remote host. - #Copyright (C) 1995 -- 2007, T. V. Raman -@@ -42,7 +42,7 @@ - } - - --set tcl /usr/bin/tcl -+set tcl /usr/bin/tclsh - regsub {/ssh-} $argv0 {/} tts - puts stderr "Running " - exec ssh -o StrictHostKeyChecking=no $host \ -diff -Nru emacspeak-30.0.orig/servers/ssh-outloud emacspeak-30.0/servers/ssh-outloud ---- emacspeak-30.0.orig/servers/ssh-outloud 2008-10-03 02:43:51.000000000 +0200 -+++ emacspeak-30.0/servers/ssh-outloud 2009-09-22 21:57:34.101606524 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/tcl -+#!/usr/bin/tclsh - #$Id: ssh-outloud 5700 2008-07-20 17:46:53Z tv.raman.tv $ - #Description: Launch a TTS server on a remote host. - #Copyright (C) 1995 -- 2007, T. V. Raman -@@ -42,7 +42,7 @@ - } - - --set tcl /usr/bin/tcl -+set tcl /usr/bin/tclsh - regsub {/ssh-} $argv0 {/} tts - puts stderr "Running " - exec ssh -o StrictHostKeyChecking=no $host \ diff --git a/emacspeak.spec b/emacspeak.spec index 737c042..a6993c7 100644 --- a/emacspeak.spec +++ b/emacspeak.spec @@ -1,6 +1,6 @@ Name: emacspeak -Version: 58.0 -Release: 1mamba +Version: 59.0 +Release: 2mamba Summary: Emacspeak speech-enables Emacs to turn Emacs into a complete audio desktop Group: System/Multimedia Vendor: openmamba @@ -8,9 +8,6 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://emacspeak.sourceforge.net/ Source: https://github.com/tvraman/emacspeak/releases/download/%{version}/emacspeak-%{version}.tar.bz2 -Patch0: %{name}-30.0-no_install_info.patch -Patch1: %{name}-30.0-tclsh.patch -Patch2: %{name}-30.0-python.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -34,13 +31,9 @@ Emacspeak speech-enables Emacs to turn Emacs into a complete audio desktop. %prep %setup -q -#-D -T -#:<< _EOF -#%patch0 -p1 -#%patch1 -p1 -#%patch2 -p1 sed -i "s|-m32||" servers/linux-outloud/Makefile sed -i "s|^#!/usr/bin/tcl$|#!/usr/bin/tclsh|" servers/ssh-espeak +sed -i "s|^#!/usr/local/bin/perl|#!/usr/bin/perl|" utils/*.pl rm -f lisp/sudoku.el # remove prebuilt x86_64 binary rm -f etc/pickup-c/pickup @@ -64,50 +57,16 @@ rm -f %{buildroot}%{_infodir}/turning-twenty.info* %files %defattr(-,root,root) -#%{_bindir}/emacspeak %dir %{_libdir}/emacspeak -%{_libdir}/emacspeak/aster-math -%{_libdir}/emacspeak/attic-readme -%{_libdir}/emacspeak/README -%{_libdir}/emacspeak/Makefile -%{_libdir}/emacspeak/README.md -%{_libdir}/emacspeak/run -%{_libdir}/emacspeak/runq -%dir %{_libdir}/emacspeak/bash-utils -%{_libdir}/emacspeak/bash-utils/* -%dir %{_libdir}/emacspeak/blog-archive -%{_libdir}/emacspeak/blog-archive/* -%dir %{_libdir}/emacspeak/etc/ -%{_libdir}/emacspeak/etc/.nosearch -%{_libdir}/emacspeak/etc/.youtube-dl.repos -%{_libdir}/emacspeak/etc/* -%dir %{_libdir}/emacspeak/info -%{_libdir}/emacspeak/info/.nosearch -%{_libdir}/emacspeak/info/.codespell -%{_libdir}/emacspeak/info/* -%dir %{_libdir}/emacspeak/js -%{_libdir}/emacspeak/js/Readme.org -%{_libdir}/emacspeak/js/node/.indium.json -%dir %{_libdir}/emacspeak/js/node -%{_libdir}/emacspeak/js/node/* -%dir %{_libdir}/emacspeak/lisp/ -%{_libdir}/emacspeak/lisp/* -%{_libdir}/emacspeak/lisp/.freekeys -%{_libdir}/emacspeak/lisp/.open-street-maps -%{_libdir}/emacspeak/lisp/.voices.txt -%dir %{_libdir}/emacspeak/media/ -%{_libdir}/emacspeak/media/* -%{_libdir}/emacspeak/media/.nosearch -#%dir %{_libdir}/emacspeak/nyxttalk -#%{_libdir}/emacspeak/nyxttalk/* -%{_libdir}/emacspeak/servers/ -%{_libdir}/emacspeak/sounds/ -%{_libdir}/emacspeak/stumpwm/ -%dir %{_libdir}/emacspeak/xsl -%{_libdir}/emacspeak/xsl/.nosearch -%{_libdir}/emacspeak/xsl/* +%{_libdir}/emacspeak/* %changelog +* Wed Feb 28 2024 Silvan Calarco 59.0-2mamba +- fix requirements for /usr/local/bin/perl + +* Mon Feb 12 2024 Automatic Build System 59.0-1mamba +- automatic version update by autodist + * Wed Sep 13 2023 Automatic Build System 58.0-1mamba - automatic version update by autodist