rpms/emacspeak/devel emacspeak-28.0-no-httpd.patch, NONE, 1.1 emacspeak-15.0-fixpref.patch, 1.1, 1.2 emacspeak.spec, 1.23, 1.24 emacspeak-no-linux-espeak.patch, 1.1, NONE emacspeak-tcl-pkgreq-tclx.patch, 1.5, NONE

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/emacspeak/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7735

Modified Files:
	emacspeak-15.0-fixpref.patch emacspeak.spec 
Added Files:
	emacspeak-28.0-no-httpd.patch 
Removed Files:
	emacspeak-no-linux-espeak.patch 
	emacspeak-tcl-pkgreq-tclx.patch 
Log Message:
- update to 28.0 with emacspeak-28.0-no-httpd.patch
- replace emacspeak-tcl-pkgreq-tclx.patch with sed
- emacspeak-no-linux-espeak.patch no longer needed
- update emacspeak-15.0-fixpref.patch for patch fuzz


emacspeak-28.0-no-httpd.patch:

--- NEW FILE emacspeak-28.0-no-httpd.patch ---
diff -u emacspeak-28.0/Makefile\~ emacspeak-28.0/Makefile
--- emacspeak-28.0/Makefile~	2008-01-28 11:13:27.000000000 +1000
+++ emacspeak-28.0/Makefile	2008-09-25 12:12:45.000000000 +1000
@@ -285,8 +285,6 @@
 	$(INSTALL)  -m 644 ${JS}  $(libdir)/js
 	$(INSTALL) -d $(libdir)/servers
 	$(INSTALL) -d $(libdir)/servers/python
-	$(INSTALL) -d $(libdir)/servers/httpd
-	$(INSTALL)  -m 644 ${TCLHTTPD}  $(libdir)/servers/tts.tcl
 	$(INSTALL) -d $(libdir)/servers/linux-outloud
 	$(INSTALL)  -m 755 ${OUTLOUD}  $(libdir)/servers/linux-outloud
 	cp   ${PYFILES}  $(libdir)/servers/python

emacspeak-15.0-fixpref.patch:

Index: emacspeak-15.0-fixpref.patch
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/devel/emacspeak-15.0-fixpref.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacspeak-15.0-fixpref.patch	9 Sep 2004 04:30:41 -0000	1.1
+++ emacspeak-15.0-fixpref.patch	25 Sep 2008 02:23:55 -0000	1.2
@@ -1,11 +1,12 @@
---- emacspeak-15.0/info/Makefile.fixpref	Tue Mar  5 12:33:18 2002
-+++ emacspeak-15.0/info/Makefile	Tue Mar  5 12:34:00 2002
-@@ -11,7 +11,7 @@
+diff -up emacspeak-28.0/info/Makefile.orig emacspeak-28.0/info/Makefile
+--- emacspeak-28.0/info/Makefile.orig	2007-05-04 11:08:58.000000000 +1000
++++ emacspeak-28.0/info/Makefile	2008-09-25 09:47:25.000000000 +1000
+@@ -28,7 +28,7 @@ options.texi:  
  
  install: emacspeak.info
  	if test  -x /sbin/install-info ; then \
 -		install-info emacspeak.info /etc/info-dir; \
 +		install-info emacspeak.info $(infodir)/info-dir; \
  	fi
- 	$(INSTALL)  -m 644 emacspeak.info* $(infodir)
+ 	$(INSTALL)  -m 644 *.info* $(infodir)
  


Index: emacspeak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacspeak/devel/emacspeak.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- emacspeak.spec	4 Oct 2007 06:35:09 -0000	1.23
+++ emacspeak.spec	25 Sep 2008 02:23:55 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: emacspeak -- The Complete Audio Desktop
 Name: emacspeak
-Version: 26
-Release: 3%{?dist}
+Version: 28.0
+Release: 1%{?dist}
 # main lisp files are GPL2+
 # lisp/atom-blogger and lisp/g-client are BSD
 License: GPLv2+ and BSD
@@ -17,8 +17,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: emacs, tclx
 Patch0: emacspeak-15.0-fixpref.patch
-Patch1: emacspeak-tcl-pkgreq-tclx.patch
-Patch2: emacspeak-no-linux-espeak.patch
+Patch1: emacspeak-28.0-no-httpd.patch
 
 %description 
 Emacspeak is a speech interface that allows visually impaired users to
@@ -32,31 +31,27 @@
 opens up the Internet to visually impaired users around the world.
 
 %prep
-%setup -q -n %{name}-%{version}.0
-%patch0 -p1
-%patch1 -p1 -b .1-tclx
-%patch2 -p1 -b .2-espeak
+%setup -q
+%patch0 -p1 -b .0-infodir
+%patch1 -p1 -b .1-httpd
 
 
+sed -i -e "s%#!/usr/bin/tcl$%#!/usr/bin/tclsh\npackage require Tclx%" \
+  servers/{dtk-exp,espeak,outloud,speech-server,ssh-dtk-exp,ssh-outloud}
+
 %build
 make  config SRC=`pwd`
 make
 
-
 %install
 rm -rf %{buildroot}
-# make sure install-info is in path
-export PATH=$PATH:/sbin
-#mkdir -p %{buildroot}%{_infodir}
 make install prefix=%{buildroot}%{_prefix} infodir=%{buildroot}%{_infodir}
 rm -f %{buildroot}%{_infodir}/*dir
-#rm %{buildroot}%{_infodir}/*.gz
-perl -pi -e "s|%{buildroot}||g" %{buildroot}%{_bindir}/emacspeak
+sed -i -e "s|%{buildroot}||g" %{buildroot}%{_bindir}/emacspeak
  
 rm %{buildroot}%{_datadir}/emacs/site-lisp/emacspeak/{.nosearch,sounds/emacspeak.mp3}
 rm -r %{buildroot}%{_datadir}/emacs/site-lisp/emacspeak/{realaudio,shoutcast}
 
-
 %post
 /sbin/install-info %{_infodir}/emacspeak.info.gz %{_infodir}/dir --section "Accessibility" || :
 
@@ -78,7 +73,14 @@
 %{_infodir}/*
 
 %changelog
-* Thu Oct  4 2007 Jens Petersen <petersen at redhat.com> - 26-3
+* Thu Sep 25 2008 Jens Petersen <petersen at redhat.com> - 28.0-1
+- update to 28.0 with emacspeak-28.0-no-httpd.patch
+- replace emacspeak-tcl-pkgreq-tclx.patch with sed
+- emacspeak-no-linux-espeak.patch no longer needed
+- update emacspeak-15.0-fixpref.patch for patch fuzz
+
+
+* Thu Oct  4 2007 Jens Petersen <petersen at redhat.com> - 26-3.fc8
 - use requires instead of prereq for post and preun install-info
 
 * Mon Aug 13 2007 Jens Petersen <petersen at redhat.com>


--- emacspeak-no-linux-espeak.patch DELETED ---


--- emacspeak-tcl-pkgreq-tclx.patch DELETED ---