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

[Rex Dieter (rdieter)]

Author: rdieter

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

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-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Oct 2005 14:18:18 -0000	1.4
+++ .cvsignore	18 Oct 2005 12:40:32 -0000	1.5
@@ -1,3 +1,3 @@
+maxima-5.9.2.tar.gz
 maximabook-19-Sept-2004.pdf
 macref.pdf
-maxima-5.9.1.9rc4.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-3/maxima.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- maxima.spec	6 Oct 2005 03:00:15 -0000	1.9
+++ maxima.spec	18 Oct 2005 12:40:32 -0000	1.10
@@ -1,11 +1,9 @@
 
-%define beta rc4
-
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.9.1.9rc4
+Version: 5.9.2
 
-Release: 3%{?dist} 
+Release: 2%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -16,21 +14,21 @@
 ExclusiveArch: %{ix86} x86_64 
 
 %ifarch %{ix86} x86_64
-%define _with_clisp 1
-#define _with_cmucl 1
+%define _enable_clisp --enable-clisp 
+#define _enable_cmucl --enable-cmucl 
 # gcl not built for fc5/development (yet)
 %if "%{?fedora}" < "5"
-%define _with_gcl 1
+%define _enable_gcl --enable-gcl 
 %endif
-# seems to hang/crash in mock(??), disable for now
-#define _with_sbcl 1
+# sbcl build fails: http://bugzilla.redhat.com/bugzilla/170026 
+#define _enable_sbcl --enable-sbcl 
 %endif
 
 %ifarch ppc
-#define _with_clisp 1
-#define _with_cmucl 1
-#define _with_gcl 1
-#define _with_sbcl 1
+#define _enable_clisp --enable-clisp 
+#define _enable_cmucl --enable-cmucl 
+#define _enable_gcl --enable-gcl 
+#define _enable_sbcl --enable-sbcl 
 %endif
 
 Source1: maxima.png
@@ -44,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.
@@ -57,7 +57,7 @@
 BuildRequires: desktop-file-utils
 # /usr/bin/wish
 BuildRequires: tk
-%{?beta:BuildRequires: automake}
+BuildRequires: automake
 
 Requires: %{name}-runtime = %{version}
 Requires: gnuplot
@@ -76,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}
@@ -88,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
@@ -104,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 
@@ -116,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
@@ -128,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
@@ -161,9 +161,9 @@
 # remove CVS crud
 find -name CVS -type d | xargs rm -r
 
-#if "%{?beta:1}" == "1"
-%if "%{?_with_sbcl:1}" == "1"
-# seems to be needed only if --with sbcl
+%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
@@ -172,10 +172,10 @@
 
 %build
 %configure \
-  %{?_with_clisp: --enable-clisp }%{!?_with_clisp:--disable-clisp } \
-  %{?_with_cmucl: --enable-cmucl --with-cmucl-runtime=%{_libdir}/cmucl/bin/lisp }%{!?_with_cmucl:--disable-cmucl } \
-  %{?_with_gcl: --enable-gcl }%{!?_with_gcl: --disable-gcl } \
-  %{?_with_sbcl: --enable-sbcl }%{!?_with_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}
 
@@ -196,7 +196,7 @@
 
 
 %check || :
-time make check
+make check
 
 
 %install
@@ -241,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
 
 
@@ -294,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/
@@ -302,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/
@@ -310,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/
@@ -318,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/
@@ -328,6 +328,13 @@
 
 
 %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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Oct 2005 13:58:53 -0000	1.3
+++ sources	18 Oct 2005 12:40:32 -0000	1.4
@@ -1,3 +1,3 @@
-c101a1ce604d31b02bbc2f37cced280d  macref.pdf
+dff996cd5c2c0c871977a26e6fb001f3  maxima-5.9.2.tar.gz
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
-d1aa7aaa5bd3059d0e93c562ae259263  maxima-5.9.1.9rc4.tar.gz
+c101a1ce604d31b02bbc2f37cced280d  macref.pdf