[emacspeak] require and default to espeak

Jens Petersen petersen at fedoraproject.org
Thu Oct 24 04:21:43 UTC 2013


commit 819312f4640693465bb3870c8d5c48bf92205f1c
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Oct 24 13:21:44 2013 +0900

    require and default to espeak

 emacspeak-38.0-default-espeak.patch |   12 ++++++++++++
 emacspeak.spec                      |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/emacspeak-38.0-default-espeak.patch b/emacspeak-38.0-default-espeak.patch
new file mode 100644
index 0000000..d3aad61
--- /dev/null
+++ b/emacspeak-38.0-default-espeak.patch
@@ -0,0 +1,12 @@
+diff -up emacspeak-38.0/lisp/dtk-speak.el~ emacspeak-38.0/lisp/dtk-speak.el
+--- emacspeak-38.0/lisp/dtk-speak.el~	2013-03-31 01:54:21.000000000 +0900
++++ emacspeak-38.0/lisp/dtk-speak.el	2013-10-24 13:08:04.981021180 +0900
+@@ -66,7 +66,7 @@
+ (declare-function emacspeak-queue-auditory-icon "emacspeak-sounds.el" (icon))
+ ;;;###autoload 
+ (defvar dtk-program
+-  (or  (getenv "DTK_PROGRAM" ) "dtk-exp")
++  (or  (getenv "DTK_PROGRAM" ) "espeak")
+   "The program to use to talk to the speech engine.
+ Possible choices at present:
+ dtk-exp     For the Dectalk Express.
diff --git a/emacspeak.spec b/emacspeak.spec
index d9e91fa..1afdb73 100644
--- a/emacspeak.spec
+++ b/emacspeak.spec
@@ -1,7 +1,7 @@
 Summary: Emacs Speech interface
 Name: emacspeak
 Version: 38.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 # main lisp files are GPL2+
 # lisp/atom-blogger and lisp/g-client are BSD
 License: GPLv2+ and BSD
@@ -17,12 +17,14 @@ BuildRequires: perl
 BuildRequires: texinfo
 BuildRequires: tcl-devel
 Requires: emacs
+Requires: espeak
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: tclx
 Patch0: emacspeak-install-info-dir.patch
 Patch1: emacspeak-36.0-tclsh8.4_ia32.patch
 Patch2: emacspeak-38.0-espeak-tcl.patch
 Patch3: emacspeak-38.0-espeak-libdir.patch
+Patch4: emacspeak-38.0-default-espeak.patch
 
 %description 
 Emacspeak is a speech interface that allows visually impaired users to
@@ -41,6 +43,7 @@ opens up the Internet to visually impaired users around the world.
 %patch1 -p1 -b .1-tclsh
 %patch2 -p1 -b .2-tcl
 %patch3 -p1 -b .3-libdir
+%patch4 -p1 -b .4-espeak
 
 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
@@ -100,6 +103,9 @@ fi
 %{_infodir}/*
 
 %changelog
+* Thu Oct 24 2013 Jens Petersen <petersen at redhat.com> - 38.0-5
+- require and default to espeak
+
 * Wed Oct 23 2013 Jens Petersen <petersen at redhat.com> - 38.0-4
 - build espeak module, so package is now arch
 - does not need findutils to build (#225727)


More information about the scm-commits mailing list