rpms/emacspeak/devel .cvsignore, 1.6, 1.7 emacspeak-tcl-pkgreq-tclx.patch, 1.1, 1.2 emacspeak.spec, 1.15, 1.16 sources, 1.6, 1.7

[fedora-cvs-commits redhat com]

Author: petersen

Update of /cvs/dist/rpms/emacspeak/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5667

Modified Files:
	.cvsignore emacspeak-tcl-pkgreq-tclx.patch emacspeak.spec 
	sources 
Log Message:
- update to version 25
  - update emacspeak-tcl-pkgreq-tclx.patch
- protect install-info in %%post and %%preun (Ville Skytta)
Resolves: #223685



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/emacspeak/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 15:35:34 -0000	1.6
+++ .cvsignore	22 Jan 2007 00:19:25 -0000	1.7
@@ -1 +1 @@
-emacspeak-23.0.tar.bz2
+emacspeak-25.tar.bz2

emacspeak-tcl-pkgreq-tclx.patch:
 dsp-outloud   |    4 +++-
 dtk-exp       |    4 +++-
 dtk-mv        |    4 +++-
 dtk-soft      |    4 +++-
 outloud       |    4 +++-
 speech-server |    4 +++-
 ssh-dtk-exp   |    4 +++-
 ssh-outloud   |    2 ++
 8 files changed, 23 insertions(+), 7 deletions(-)

Index: emacspeak-tcl-pkgreq-tclx.patch
===================================================================
RCS file: /cvs/dist/rpms/emacspeak/devel/emacspeak-tcl-pkgreq-tclx.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacspeak-tcl-pkgreq-tclx.patch	8 Feb 2006 06:15:50 -0000	1.1
+++ emacspeak-tcl-pkgreq-tclx.patch	22 Jan 2007 00:19:25 -0000	1.2
@@ -1,142 +1,79 @@
-diff: emacspeak-23.505/realaudio/.cvsignore.~14.4997.: No such file or directory
---- emacspeak-23.505/servers/dtk-soft~	2005-11-26 01:30:52.000000000 +0900
-+++ emacspeak-23.505/servers/dtk-soft	2006-02-08 14:50:28.000000000 +0900
-@@ -1,4 +1,4 @@
+--- emacspeak-25/servers/outloud.1-tclx	2006-11-04 01:19:06.000000000 +1000
++++ emacspeak-25/servers/outloud	2007-01-22 10:11:41.000000000 +1000
+@@ -1,4 +1,6 @@
 -#!/usr/bin/tcl
 +#!/usr/bin/tclsh
- # Keywords: Emacspeak, Software Dectalk , TCL
- # {{{ LCD Entry: 
- 
-@@ -32,6 +32,8 @@
- # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- 
- # }}}
 +package require Tclx
 +
- # {{{source common code 
- 
- set wd [file dirname $argv0]
---- emacspeak-23.505/servers/outloud~	2005-11-26 01:30:52.000000000 +0900
-+++ emacspeak-23.505/servers/outloud	2006-02-08 14:49:17.000000000 +0900
-@@ -1,4 +1,4 @@
--#!/usr/bin/tcl
-+#!/usr/bin/tclsh
  # Keywords: Emacspeak, ViaVoice Outloud , TCL
  # {{{ LCD Entry: 
  
-@@ -32,6 +32,9 @@
- # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- 
- # }}}
-+
-+package require Tclx
-+
- # {{{source common code 
- 
- set wd [file dirname $argv0]
---- emacspeak-23.505/servers/dtk-exp~	2005-11-26 01:30:52.000000000 +0900
-+++ emacspeak-23.505/servers/dtk-exp	2006-02-08 14:48:55.000000000 +0900
-@@ -1,4 +1,4 @@
+--- emacspeak-25/servers/dsp-outloud.1-tclx	2006-08-12 13:34:09.000000000 +1000
++++ emacspeak-25/servers/dsp-outloud	2007-01-22 10:10:14.000000000 +1000
+@@ -1,4 +1,6 @@
 -#!/usr/bin/tcl
 +#!/usr/bin/tclsh
- # $Id$
- # Description:  Interfacing to a Dectalk via TCL. 
- # Keywords: Emacspeak, Dectalk, TCL
-@@ -56,6 +56,9 @@
- # s == some
- 
- # }}}
-+
 +package require Tclx
 +
- # {{{source common code 
+ # Keywords: Emacspeak, ViaVoice Outloud , TCL
+ # {{{ LCD Entry: 
  
- set wd [file dirname $argv0]
---- emacspeak-23.505/servers/dtk-mv~	2005-11-26 01:30:52.000000000 +0900
-+++ emacspeak-23.505/servers/dtk-mv	2006-02-08 14:51:05.000000000 +0900
-@@ -1,4 +1,4 @@
+--- emacspeak-25/servers/dtk-mv.1-tclx	2006-08-12 13:34:09.000000000 +1000
++++ emacspeak-25/servers/dtk-mv	2007-01-22 10:10:47.000000000 +1000
+@@ -1,4 +1,6 @@
 -#!/usr/bin/tcl
 +#!/usr/bin/tclsh
++package require Tclx
++
  # $Id$
  # Description:  Interfacing to a Dectalk via TCL. 
  # Keywords: Emacspeak, Dectalk, TCL
-@@ -38,6 +38,9 @@
- # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- 
- # }}}
-+
-+package require Tclx
-+
- # {{{commandabbreviations 
- 
- #This version uses shortened dtk command strings to improve performance 
---- emacspeak-23.505/servers/ssh-dtk-exp~	2005-11-26 01:30:52.000000000 +0900
-+++ emacspeak-23.505/servers/ssh-dtk-exp	2006-02-08 14:50:43.000000000 +0900
-@@ -1,4 +1,4 @@
+--- emacspeak-25/servers/dtk-exp.1-tclx	2006-11-04 01:19:06.000000000 +1000
++++ emacspeak-25/servers/dtk-exp	2007-01-22 10:10:32.000000000 +1000
+@@ -1,4 +1,6 @@
 -#!/usr/bin/tcl
 +#!/usr/bin/tclsh
- #$Id$
- #Description: Launch a TTS server on a remote host.
- #Copyright (C) 1995 -- 2003, T. V. Raman 
-@@ -6,6 +6,8 @@
- 
- # Running TTS server remotely.
- # }}}
 +package require Tclx
 +
- set host [exec hostname]
- puts stderr "running on host <$host>"
- if [expr $argc == 0] {
---- emacspeak-23.505/servers/dsp-outloud~	2005-11-26 01:30:52.000000000 +0900
-+++ emacspeak-23.505/servers/dsp-outloud	2006-02-08 14:47:50.000000000 +0900
-@@ -1,4 +1,4 @@
+ # $Id$
+ # Description:  Interfacing to a Dectalk via TCL.
+ # Keywords: Emacspeak, Dectalk, TCL
+--- emacspeak-25/servers/speech-server.1-tclx	2006-08-12 13:34:09.000000000 +1000
++++ emacspeak-25/servers/speech-server	2007-01-22 10:12:00.000000000 +1000
+@@ -1,4 +1,6 @@
 -#!/usr/bin/tcl
 +#!/usr/bin/tclsh
- # Keywords: Emacspeak, ViaVoice Outloud , TCL
- # {{{ LCD Entry: 
- 
-@@ -32,6 +32,9 @@
- # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- 
- # }}}
-+
 +package require Tclx
 +
- # {{{source common code 
- 
- set wd [file dirname $argv0]
---- emacspeak-23.505/servers/speech-server~	2005-11-26 01:30:52.000000000 +0900
-+++ emacspeak-23.505/servers/speech-server	2006-02-08 14:51:37.000000000 +0900
-@@ -1,4 +1,4 @@
--#!/usr/bin/tcl
-+#!/usr/bin/tclsh
  # $Id$
  # Description:  Speech server
  #Usage: tcl speech-server port device-specific-script
-@@ -37,6 +37,9 @@
- # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- 
- # }}}
-+
+--- emacspeak-25/servers/dtk-soft.1-tclx	2006-09-13 13:05:15.000000000 +1000
++++ emacspeak-25/servers/dtk-soft	2007-01-22 10:11:22.000000000 +1000
+@@ -1,4 +1,6 @@
+-#!/usr/bin/tcl
++#!/usr/bin/tclsh
 +package require Tclx
 +
- # {{{Initialize and get ready
+ # Keywords: Emacspeak, Software Dectalk , TCL
+ # {{{ LCD Entry: 
  
- set port [lindex $argv 0]
---- emacspeak-23.505/servers/ssh-outloud~	2005-11-26 01:30:52.000000000 +0900
-+++ emacspeak-23.505/servers/ssh-outloud	2006-02-08 14:49:49.000000000 +0900
-@@ -1,4 +1,4 @@
+--- emacspeak-25/servers/ssh-outloud.1-tclx	2006-08-30 12:50:04.000000000 +1000
++++ emacspeak-25/servers/ssh-outloud	2007-01-22 10:12:40.000000000 +1000
+@@ -1,4 +1,6 @@
+ #!/usr/bin/tcl
++package require Tclx
++
+ #$Id$
+ #Description: Launch a TTS server on a remote host.
+ #Copyright (C) 1995 -- 2006, T. V. Raman 
+--- emacspeak-25/servers/ssh-dtk-exp.1-tclx	2006-08-30 12:50:04.000000000 +1000
++++ emacspeak-25/servers/ssh-dtk-exp	2007-01-22 10:12:24.000000000 +1000
+@@ -1,4 +1,6 @@
 -#!/usr/bin/tcl
 +#!/usr/bin/tclsh
- #$Id$
- #Description: Launch a TTS server on a remote host. via ssh
- #Copyright (C) 1995 -- 2003, T. V. Raman 
-@@ -17,6 +17,8 @@
- #"do you want to continue connecting" question.
- 
- # }}}
 +package require Tclx
 +
- set host [exec hostname]
- puts stderr "running on host <$host>"
- if [expr $argc == 0] {
+ #$Id$
+ #Description: Launch a TTS server on a remote host.
+ #Copyright (C) 1995 -- 2006, T. V. Raman 


Index: emacspeak.spec
===================================================================
RCS file: /cvs/dist/rpms/emacspeak/devel/emacspeak.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- emacspeak.spec	12 Jul 2006 05:44:37 -0000	1.15
+++ emacspeak.spec	22 Jan 2007 00:19:25 -0000	1.16
@@ -1,9 +1,7 @@
-%define majver 23
-
 Summary: emacspeak -- The Complete Audio Desktop
 Name: emacspeak
-Version: %{majver}.0
-Release: 2.1
+Version: 25
+Release: 1%{%dist}
 License: GPL
 Group: Applications/Editors
 Source: http://download.sourceforge.net/emacspeak/emacspeak-%{version}.tar.bz2
@@ -30,11 +28,10 @@
 opens up the Internet to visually impaired users around the world.
 
 %prep
-%setup -q -n %{name}-%{majver}.505
+%setup -q -c
 %patch0 -p1
 %patch1 -p1 -b .1-tclx
 
-find -type f -name .cvsignore | xargs rm
 
 %build
 make  config SRC=`pwd`
@@ -56,11 +53,11 @@
 
 
 %post
-/sbin/install-info %{_infodir}/emacspeak.info.gz %{_infodir}/dir --section "Accessibility"
+/sbin/install-info %{_infodir}/emacspeak.info.gz %{_infodir}/dir --section "Accessibility" || :
 
 %preun
 if [ "$1" = 0 ]; then
-	/sbin/install-info --delete %{_infodir}/emacspeak.info.gz %{_infodir}/dir --section "Accessibility"
+	/sbin/install-info --delete %{_infodir}/emacspeak.info.gz %{_infodir}/dir --section "Accessibility" || :
 fi
 
 %clean
@@ -76,6 +73,11 @@
 %{_infodir}/*
 
 %changelog
+* Mon Jan 22 2007 Jens Petersen <petersen redhat com> - 25-1%{%dist}
+- update to version 25
+  - update emacspeak-tcl-pkgreq-tclx.patch
+- protect install-info in %%post and %%preun (Ville Skyttä, #223685)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating redhat com> - 23.0-2.1
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/emacspeak/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 15:35:34 -0000	1.6
+++ sources	22 Jan 2007 00:19:25 -0000	1.7
@@ -1 +1 @@
-95c09468fb4cc8d2d0cf1f7502f39ee2  emacspeak-23.0.tar.bz2
+0024036a113f743f81ce277f5f557de8  emacspeak-25.tar.bz2