rpms/nyquist/devel nyquist.spec,1.6,1.7 sources,1.6,1.7

[Gérard Milmeister (gemi)]

Author: gemi

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

Modified Files:
	nyquist.spec sources 
Log Message:



Index: nyquist.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/devel/nyquist.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nyquist.spec	19 Feb 2008 03:41:37 -0000	1.6
+++ nyquist.spec	7 Jul 2008 22:28:20 -0000	1.7
@@ -1,16 +1,20 @@
 Name:           nyquist
-Version:        2.37
-Release:        2%{?dist}
+Version:        3.01
+Release:        1%{?dist}
 Summary:        Sound synthesis and composition language with a Lisp syntax
 
 Group:          Applications/Multimedia
 License:        BSD
 URL:            http://www-2.cs.cmu.edu/~music/music.software.html
-Source0:        http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc237.zip
+Source0:        http://www-2.cs.cmu.edu/~music/nyquist/nyqsrc301.zip
 Patch0:         nyqsrc231-pafix.patch
+Patch1:         nyqsrc301-inc.patch
+Patch2:         nyqsrc301-javafix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel
+BuildRequires:  java-1.6.0-openjdk-devel
 BuildRequires:  dos2unix
+Requires:       java-1.6.0-openjdk
 
 %description
 Nyquist is a language for sound synthesis and music
@@ -23,19 +27,25 @@
 
 %prep
 %setup -q -n nyquist
-%patch0 -p1
+%patch0 -p1 -b .pafix
+%patch1 -p1 -b .inc
+%patch2 -p1 -b .javafix
+
 # remove cvs cruft
 find -name CVS | xargs rm -fr
 # add opt flags
 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 -i "s|^LFLAGS =.*|LFLAGS = -lm -lpthread -lasound|" sys/unix/linux/Makefile
+sed -ifix "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
+find -name "*.lsp" | xargs chmod 0644
 # change end-of-line
 find -name "*.htm*" \
     -or -name "*.lsp" \
@@ -44,20 +54,23 @@
     -or -name "*.dat" | xargs dos2unix -q
 
 %build
-(cd misc; make %{?_smp_mflags})
 rm -f runtime/system.lsp
-make %{?_smp_mflags} -f sys/unix/linux/Makefile ny runtime/system.lsp
+make %{?_smp_mflags} -f sys/unix/linux/Makefile
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/nyquist
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/nyquist/java
 mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
 
 cp -pr runtime $RPM_BUILD_ROOT%{_datadir}/nyquist
 cp -pr lib $RPM_BUILD_ROOT%{_datadir}/nyquist
+cp -pr demos $RPM_BUILD_ROOT%{_datadir}/nyquist
 cp -p ny $RPM_BUILD_ROOT%{_libexecdir}
+cp -p jnyqide/jNyqIDE.jar $RPM_BUILD_ROOT%{_datadir}/nyquist/java
+
 
 cat > $RPM_BUILD_ROOT%{_bindir}/ny <<EOF
 #!/bin/sh
@@ -66,6 +79,13 @@
 EOF
 chmod 0755 $RPM_BUILD_ROOT%{_bindir}/ny
 
+cat > $RPM_BUILD_ROOT%{_bindir}/jny <<EOF
+#!/bin/sh
+export XLISPPATH=%{_datadir}/nyquist/runtime:%{_datadir}/nyquist/lib
+exec java -jar %{_datadir}/nyquist/java/jNyqIDE.jar \$*
+EOF
+chmod 0755 $RPM_BUILD_ROOT%{_bindir}/jny
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -73,13 +93,17 @@
 %files
 %defattr(-,root,root,-)
 %doc Readme.txt license.txt advantages.txt files.txt todo.txt
-%doc demos doc
+%doc doc
 %{_bindir}/ny
+%{_bindir}/jny
 %{_libexecdir}/ny
 %{_datadir}/nyquist
 
 
 %changelog
+* Mon Jul  7 2008 Gerard Milmeister <gemi at bluewin.ch> - 3.01-1
+- new release 3.01
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.37-2
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nyquist/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Dec 2007 15:48:28 -0000	1.6
+++ sources	7 Jul 2008 22:28:20 -0000	1.7
@@ -1 +1 @@
-f14bc518db40e7cd7fc546cb10e5d5ab  nyqsrc237.zip
+f2ad65bb2ed7e1dc2d7db2e052be9592  nyqsrc301.zip