rpms/nyquist/devel nyqsrc301-javafix.patch, 1.1, 1.2 nyquist.spec, 1.7, 1.8

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/pkgs/rpms/nyquist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1621

Modified Files:
	nyqsrc301-javafix.patch nyquist.spec 
Log Message:


nyqsrc301-javafix.patch:

Index: nyqsrc301-javafix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/devel/nyqsrc301-javafix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nyqsrc301-javafix.patch	7 Jul 2008 22:25:58 -0000	1.1
+++ nyqsrc301-javafix.patch	7 Jul 2008 22:38:12 -0000	1.2
@@ -64,19 +64,3 @@
  
  # Standard list of includes (common to all unix versions)
  INCL = -Inyqsrc -Itran -Ixlisp -Isys/unix -Icmt -Isnd -Ifft \
-@@ -62,12 +62,12 @@ CC = gcc
- # ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o
- #
- # to use OSS:
--USE_ALSA = 
--ALSA_OBJECTS = 
-+USE_ALSA = -DPA_USE_ALSA=1 
-+ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o 
- 
- # to enable command line editing, use -DREADLINE. WARNING: THIS WILL DISABLE THE
- # ABILITY TO INTERRUPT LISP AND USE SOME OTHER HANDY CONTROL CHARACTERS
--CFLAGS = -DOSC -DCMTSTUFF -DPA_LITTLE_ENDIAN -g $(INCL) -DHAVE_LIBPTHREAD=1 \
-+CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables  -DOSC -DCMTSTUFF -DPA_LITTLE_ENDIAN -g $(INCL) -DHAVE_LIBPTHREAD=1 \
-      -DPA_USE_OSS=1 $(USE_ALSA) -DSTK_NYQUIST
- LN = g++
- # to disable command line editing, take out -lreadline -lcurses


Index: nyquist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/devel/nyquist.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nyquist.spec	7 Jul 2008 22:28:20 -0000	1.7
+++ nyquist.spec	7 Jul 2008 22:38:12 -0000	1.8
@@ -37,11 +37,10 @@
 sed -i "s|^CFLAGS =|CFLAGS = $RPM_OPT_FLAGS |" sys/unix/linux/Makefile
 sed -i "s|^CFLAGS =|CFLAGS = $RPM_OPT_FLAGS |" misc/Makefile
 # do not build with buggy readline support
-sed -ifix "s|^LFLAGS =.*|LFLAGS = -lm -lpthread -lasound|" sys/unix/linux/Makefile
+sed -i "s|^LFLAGS =.*|LFLAGS = -lm -lpthread -lasound|" sys/unix/linux/Makefile
 # build with alsa
 sed -i "s|^USE_ALSA =|USE_ALSA = -DPA_USE_ALSA=1|" sys/unix/linux/Makefile
 sed -i "s|^ALSA_OBJECTS =|ALSA_OBJECTS = portaudio/pa_linux_alsa/pa_linux_alsa.o|" sys/unix/linux/Makefile
-
 # remove dos paths that cause warnings
 sed -i 's|(setdir ".:.*")||' runtime/fileio.lsp
 # fix some permission