rpms/maxima/FC-4 maxima-5.9.2-sbcl-disable-debugger.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 maxima.spec, 1.9, 1.10 sources, 1.3, 1.4

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18243/FC-4

Modified Files:
	.cvsignore maxima.spec sources 
Added Files:
	maxima-5.9.2-sbcl-disable-debugger.patch 
Log Message:
* Wed Oct 12 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-2
- 5.9.2


maxima-5.9.2-sbcl-disable-debugger.patch:

--- NEW FILE maxima-5.9.2-sbcl-disable-debugger.patch ---
--- maxima-5.9.1.9rc4/src/Makefile.am.sbcl	2005-05-20 01:14:01.000000000 -0500
+++ maxima-5.9.1.9rc4/src/Makefile.am	2005-10-06 11:31:04.118223968 -0500
@@ -115,7 +115,7 @@
 
 
 if SBCL
-EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
+EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --disable-debugger --eval
 all-local: binary-sbcl/maxima.core
 install-exec-local: install-sbcl
 uninstall: uninstall-sbcl
--- maxima-5.9.1.9rc4/src/Makefile.in.sbcl	2005-10-02 12:55:30.000000000 -0500
+++ maxima-5.9.1.9rc4/src/Makefile.in	2005-10-06 11:31:23.267312864 -0500
@@ -169,7 +169,7 @@
 
 @ACL6_TRUE at EXECUTEACL6 = $(ACL6_NAME) -batch
 
- at SBCL_TRUE@EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
+ at SBCL_TRUE@EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --disable-debugger --eval
 
 @GCL_TRUE at EXECUTEGCL = $(GCL_NAME) -batch -eval
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Sep 2005 12:37:22 -0000	1.3
+++ .cvsignore	18 Oct 2005 12:40:33 -0000	1.4
@@ -1,3 +1,3 @@
-maxima-5.9.1.9rc1.tar.gz
+maxima-5.9.2.tar.gz
 maximabook-19-Sept-2004.pdf
 macref.pdf


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- maxima.spec	23 Sep 2005 12:09:50 -0000	1.9
+++ maxima.spec	18 Oct 2005 12:40:33 -0000	1.10
@@ -1,27 +1,36 @@
 
-## Which runtimes to build/enable?
-%define _with_clisp 1
-%define _without_cmucl 1
-%define _without_gcl 1
-%define _without_sbcl 1
-
-%define beta rc1 
-
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.9.1.9rc1
+Version: 5.9.2
 
-Release: 4%{?dist} 
+Release: 2%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
-#Source: http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?cvs}.tar.gz
-Source:	 http://maxima.sf.net/tmp-release/maxima-5.9.1.9rc1.tar.gz
+Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # add ppc (and maybe ppc64)  when lisps build again on ppc 
 #  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
 ExclusiveArch: %{ix86} x86_64 
 
+%ifarch %{ix86} x86_64
+%define _enable_clisp --enable-clisp 
+#define _enable_cmucl --enable-cmucl 
+# gcl not built for fc5/development (yet)
+%if "%{?fedora}" < "5"
+%define _enable_gcl --enable-gcl 
+%endif
+# sbcl build fails: http://bugzilla.redhat.com/bugzilla/170026 
+#define _enable_sbcl --enable-sbcl 
+%endif
+
+%ifarch ppc
+#define _enable_clisp --enable-clisp 
+#define _enable_cmucl --enable-cmucl 
+#define _enable_gcl --enable-gcl 
+#define _enable_sbcl --enable-sbcl 
+%endif
+
 Source1: maxima.png
 Source2: xmaxima.desktop
 Source6: maxima-modes.el
@@ -33,6 +42,8 @@
 Patch1: maxima-5.9.2-htmlview.patch
 # (mysterious?) xemacs patch
 Patch2: maxima.el-xemacs.patch
+# use sbcl --disable-debugger
+Patch3: maxima-5.9.2-sbcl-disable-debugger.patch
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
@@ -40,12 +51,13 @@
 # debuginfo.list ends up empty/blank anyway. disable
 %define debug_package   %{nil}
 
+BuildRequires: time
 BuildRequires: texinfo
 BuildRequires: tetex-latex
 BuildRequires: desktop-file-utils
 # /usr/bin/wish
 BuildRequires: tk
-%{?beta:BuildRequires: autoconf automake}
+BuildRequires: automake
 
 Requires: %{name}-runtime = %{version}
 Requires: gnuplot
@@ -64,7 +76,6 @@
 Group:	 Applications/Engineering 
 Requires: %{name} = %{version}-%{release} 
 Obsoletes: %{name}-xmaxima < %{version}-%{release}
-Provides:  %{name}-xmaxima = %{version}-%{release}
 Requires: tk
 %description gui
 Tcl/Tk GUI interface for %{name}
@@ -76,7 +87,7 @@
 %description src 
 %{name} lisp source code.
 
-%if "%{?_with_clisp:1}" == "1"
+%if "%{?_enable_clisp:1}" == "1"
 # to workaround mysterious(?) "cpio: MD5 sum mismatch" errors on this subpkg
 %define __prelink_undo_cmd %{nil}
 %package runtime-clisp
@@ -92,7 +103,8 @@
 Maxima compiled with Common Lisp (clisp) 
 %endif
 
-%if "%{?_with_cmucl:1}" == "1"
+%if "%{?_enable_cmucl:1}" == "1"
+%define _with_cmucl_runtime=--with-cmucl-runtime=%{_libdir}/cmucl/bin/lisp
 %package runtime-cmucl
 Summary: Maxima compiled with CMUCL
 Group:	 Applications/Engineering 
@@ -104,7 +116,7 @@
 Maxima compiled with CMU Common Lisp (cmucl) 
 %endif
 
-%if "%{?_with_gcl:1}" == "1"
+%if "%{?_enable_gcl:1}" == "1"
 %package runtime-gcl
 Summary: Maxima compiled with GCL
 Group:   Applications/Engineering
@@ -116,7 +128,7 @@
 Maxima compiled with Gnu Common Lisp (gcl)
 %endif
 
-%if "%{?_with_sbcl:1}" == "1"
+%if "%{?_enable_sbcl:1}" == "1"
 %package runtime-sbcl
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
@@ -149,21 +161,21 @@
 # remove CVS crud
 find -name CVS -type d | xargs rm -r
 
-%if "%{?beta:1}" == "1"
-#if [ ! -f configure ]; then
+%if "%{?_enable_sbcl:1}" == "1"
+%patch3 -p1 -b .sbcl-disable-debugger
+# seems to be needed only if --enable-sbcl
 aclocal
 automake --add-missing --copy
 autoconf
-#fi
 %endif
 
 
 %build
 %configure \
-  %{?_with_clisp: --enable-clisp }%{?_without_clisp:--disable-clisp } \
-  %{?_with_cmucl: --enable-cmucl --with-cmucl-runtime=%{_libdir}/cmucl/bin/lisp }%{?_without_cmucl:--disable-cmucl } \
-  %{?_with_gcl: --enable-gcl }%{?_without_gcl: --disable-gcl } \
-  %{?_with_sbcl: --enable-sbcl }%{?_without_sbcl: --disable-sbcl }
+  %{?_enable_clisp} %{!?_enable_clisp: --disable-clisp } \
+  %{?_enable_cmucl} %{?_with_cmucl_runtime} %{!?_enable_cmucl: --disable-cmucl } \
+  %{?_enable_gcl} %{!?_enable_gcl: --disable-gcl } \
+  %{?_enable_sbcl} %{!?_enable_sbcl: --disable-sbcl }
 
 make %{?_smp_mflags}
 
@@ -229,7 +241,7 @@
 # docs
 rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{version}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
 
-# when --with gcl, this (sometimes) fails to get auto-created, so we'll help out
+# _enable_gcl: debuginfo (sometimes?) fails to get auto-created, so we'll help out
 touch debugfiles.list
 
 
@@ -282,7 +294,7 @@
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*.png
 
-%if "%{?_with_clisp:1}" == "1"
+%if "%{?_enable_clisp:1}" == "1"
 %files runtime-clisp
 %defattr(-,root,root)
 %dir %{_libdir}/maxima/
@@ -290,7 +302,7 @@
 %{_libdir}/maxima/%{version}/binary-clisp
 %endif
 
-%if "%{?_with_cmucl:1}" == "1"
+%if "%{?_enable_cmucl:1}" == "1"
 %files runtime-cmucl
 %defattr(-,root,root)
 %dir %{_libdir}/maxima/
@@ -298,7 +310,7 @@
 %{_libdir}/maxima/%{version}/binary-cmucl
 %endif
 
-%if "%{?_with_gcl:1}" == "1"
+%if "%{?_enable_gcl:1}" == "1"
 %files runtime-gcl
 %defattr(-,root,root)
 %dir %{_libdir}/maxima/
@@ -306,7 +318,7 @@
 %{_libdir}/maxima/%{version}/binary-gcl
 %endif
 
-%if "%{?_with_sbcl:1}" == "1"
+%if "%{?_enable_sbcl:1}" == "1"
 %files runtime-sbcl
 %defattr(-,root,root)
 %dir %{_libdir}/maxima/
@@ -316,6 +328,24 @@
 
 
 %changelog
+* Wed Oct 12 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-2
+- 5.9.2
+
+* Thu Oct 06 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.1.9rc4-4
+- cleanup _with,_enable macros
+- -sbcl: --disable-debugger
+
+* Tue Oct 04 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.1.9rc4-3
+- 5.9.1.9rc4
+- banish _without_ macros, use only _with_ (absense of _with_foo implies
+  _without_foo)
+
+* Wed Sep 28 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.1.9rc3-1
+- 5.9.1.9rc3
+
+* Mon Sep 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.1.9rc2-1
+- 5.9.1.9rc2
+
 * Fri Sep 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.1.9rc1-4
 - --with-clisp only (for now)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Sep 2005 12:37:22 -0000	1.3
+++ sources	18 Oct 2005 12:40:33 -0000	1.4
@@ -1,3 +1,3 @@
-60e188d2c10515e7dadbc176bd138694  maxima-5.9.1.9rc1.tar.gz
+dff996cd5c2c0c871977a26e6fb001f3  maxima-5.9.2.tar.gz
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf