rpms/maxima/FC-6 maxima-5.11.0-xdg_utils.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 maxima.spec, 1.45, 1.46 sources, 1.9, 1.10 maxima-5.10.0-xdg-utils.patch, 1.1, NONE maxima-5.9.4-sbcl-disable-debugger.patch, 1.1, NONE

Wed Dec 27 22:09:13 UTC 2006

Author: rdieter

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

Modified Files:
	.cvsignore maxima.spec sources 
Added Files:
	maxima-5.11.0-xdg_utils.patch 
Removed Files:
	maxima-5.10.0-xdg-utils.patch 
	maxima-5.9.4-sbcl-disable-debugger.patch 
Log Message:
maxima-5.11.0


maxima-5.11.0-xdg_utils.patch:

--- NEW FILE maxima-5.11.0-xdg_utils.patch ---
--- maxima-5.11.0/interfaces/emacs/misc/bookmode.el.xdg_utils	2000-05-08 01:09:44.000000000 -0500
+++ maxima-5.11.0/interfaces/emacs/misc/bookmode.el	2006-12-27 13:07:51.000000000 -0600
@@ -680,7 +680,7 @@
 		
 		  (and tem
 		       (list (concat "View "(nth 1 tem))
-			     'call-process  "ghostview" nil nil nil
+			     'call-process  "xdg-open" nil nil nil
 			     (expand-file-name(nth 1 tem))
 			     ))
 		  (list "Cancel")
@@ -705,7 +705,7 @@
 			 (concat
 			  (cond ((looking-at "%PS") "")
 				(t "gzip -dc | "))
-			  "ghostview -")
+			  "xdg-open -")
 			 
 	)))
 	 
--- maxima-5.11.0/interfaces/xmaxima/Tkmaxima/Menu.tcl.xdg_utils	2006-12-09 13:52:11.000000000 -0600
+++ maxima-5.11.0/interfaces/xmaxima/Tkmaxima/Menu.tcl	2006-12-27 13:00:45.000000000 -0600
@@ -245,9 +245,9 @@
 	}
     } else {
 	
-	set selectedbrowser mozilla
+	set selectedbrowser xdg-open 
 
-	foreach b { firefox mozilla konqueror epiphany galeon amaya netscape } {
+	foreach b { xdg-open htmlview firefox mozilla konqueror epiphany galeon amaya netscape } {
 	    if { ! [catch {exec which $b} ] } {
 		set selectedbrowser $b
 		break } }
--- maxima-5.11.0/interfaces/xmaxima/Tkmaxima/Constants.tcl.xdg_utils	2006-10-01 17:42:48.000000000 -0500
+++ maxima-5.11.0/interfaces/xmaxima/Tkmaxima/Constants.tcl	2006-12-27 13:01:52.000000000 -0600
@@ -143,9 +143,9 @@
     image/gif  netmath
     image/png  netmath
     image/jpeg netmath
-    application/postscript "ghostview -safer %s"
-    application/pdf "acroread %s"
-    application/x-dvi "xdvi %s"
+    application/postscript "xdg-open %s"
+    application/pdf "xdg-open %s"
+    application/x-dvi "xdg-open %s"
 }
 set maxima_priv(imagecounter) 0
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Dec 2006 14:47:08 -0000	1.11
+++ .cvsignore	27 Dec 2006 22:08:43 -0000	1.12
@@ -1,4 +1,5 @@
 maximabook-19-Sept-2004.pdf
 macref.pdf
 maxima-5.10.0.tar.gz
-maxima-5.10.99rc2.tar.gz
+maxima-5.10.99rc3.tar.gz
+maxima-5.11.0.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-6/maxima.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- maxima.spec	13 Dec 2006 14:47:08 -0000	1.45
+++ maxima.spec	27 Dec 2006 22:08:43 -0000	1.46
@@ -1,39 +1,45 @@
 
-%define emacs_sitelisp  %{_datadir}/emacs/site-lisp/
-%define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp/
-
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.10.0
+Version: 5.11.0
 
-Release: 9%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
 Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?beta}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64 ppc
+
+ExclusiveArch: %{ix86} x86_64
 
 %define maxima_ver %{version}%{?beta}
+%define emacs_sitelisp  %{_datadir}/emacs/site-lisp/
+%define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp/
+%define texmf %{_datadir}/texmf
 
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
 %endif
 
 %ifarch %{ix86} x86_64
-%define default_lisp clisp 
+%if 0%{?fedora} > 2
+%define default_lisp gcl 
 %define _enable_clisp --enable-clisp 
 %define _enable_gcl --enable-gcl 
+%else
+%define default_lisp sbcl 
 %define _enable_sbcl --enable-sbcl 
 %endif
+%endif
 
 %ifarch ppc
-%define default_lisp sbcl
+# define default_lisp sbcl
 # clisp: http://bugzilla.redhat.com/166347
 #define _enable_clisp --enable-clisp 
 # gcl:   http://bugzilla.redhat.com/167952
 #define _enable_gcl --enable-gcl 
-%define _enable_sbcl --enable-sbcl 
+# sbcl:  http://bugzilla.redhat.com/220053
+#define _enable_sbcl --enable-sbcl 
 %endif
 
 Source1: maxima.png
@@ -44,11 +50,7 @@
 Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf
 Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf
 
-Patch1: maxima-5.10.0-xdg-utils.patch
-# (mysterious?) xemacs patch (don't use, for now)
-Patch2: maxima.el-xemacs.patch
-# use sbcl --disable-debugger
-Patch3: maxima-5.9.4-sbcl-disable-debugger.patch
+Patch1: maxima-5.11.0-xdg_utils.patch
 # emaxima fix from Camm Maguire
 Patch5: maxima-5.9.2-emaxima.patch
 # maxima-runtime-gcl: Unrecoverable error: fault count too high (bug #187647)
@@ -62,7 +64,7 @@
 
 BuildRequires: time
 # texi2dvi
-%if "%{?fedora}" > "5"
+%if 0%{?fedora} > 5 || 0%{?rhel} > 4
 BuildRequires: texinfo-tex
 %else
 BuildRequires: texinfo
@@ -140,7 +142,7 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
-%if "%{?fedora}" > "4"
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 # See http://bugzilla.redhat.com/187647
 %define setarch_hack 1
 BuildRequires: setarch
@@ -157,12 +159,11 @@
 %package runtime-sbcl
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
-# almost any sbcl will do, but we want to be sure we're using the latest -- Rex
-BuildRequires: sbcl >= 0.9.18
+BuildRequires: sbcl >= 1.0.1
 # maxima requires the *same* (or very similar) version it was built against
 # this hack should work, even in mock (-: -- Rex
 %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2)
-%if "%{?sbcl_ver}" >= "0.9"
+%if "%{?sbcl_ver}" >= "1.0"
 Requires: sbcl = %{sbcl_ver}
 %endif
 Requires: %{name} = %{version}
@@ -180,8 +181,6 @@
 install -p -m644 %{SOURCE10} .
 
 %patch1 -p1 -b .xdg_open
-#patch2 -p1 -b .xemacs
-#patch3 -p1 -b .sbcl-disable-debugger
 %patch5 -p1 -b .emaxima
 %if "%{?setarch_hack}" == "1"
 %patch6 -p1 -b .gcl-setarch
@@ -242,10 +241,6 @@
   --vendor="fedora" \
   %{SOURCE2} 
 
-# emaxima LaTeX style
-install -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima
-cp -alf $RPM_BUILD_ROOT%{_datadir}/maxima/%{maxima_ver}/emacs/*.sty \
-	$RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/emaxima/
 # (x)emacs
 install -D -m644 -p %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el
 
@@ -259,6 +254,11 @@
   touch $RPM_BUILD_ROOT$dir/site-start.d/maxima-modes.elc
 done
 
+# emaxima LaTeX style (%ghost)
+install -d $RPM_BUILD_ROOT%{texmf}/tex/latex/
+ln -sf  %{_datadir}/maxima/%{maxima_ver}/emacs \
+        $RPM_BUILD_ROOT%{texmf}/tex/latex/emaxima
+
 ## unwanted/unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 # until we get/Require rlwrap from http://utopia.knoware.nl/~hlub/uck/rlwrap/
@@ -282,11 +282,9 @@
 
 %post gui
 touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 %postun gui
 touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 %triggerin -- emacs-common
 if [ -d %{emacs_sitelisp} ]; then
@@ -314,6 +312,18 @@
  rm -f %{xemacs_sitelisp}/site-start.d/maxima-modes.el* ||:
 fi
 
+%triggerin -- tetex-latex
+if [ -d %{texmf}/tex/latex ]; then
+  rm -rf %{texmf}/tex/latex/emaxima ||:
+  ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs %{texmf}/tex/latex/emaxima ||:
+  %{_bindir}/texhash 2> /dev/null ||:
+fi
+
+%triggerun -- tetex-latex
+if [ $2 -eq 0 ]; then
+  rm -f %{texmf}/tex/latex/emaxima ||:
+fi
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -336,9 +346,8 @@
 %dir %{_libdir}/maxima/
 %dir %{_libdir}/maxima/%{maxima_ver}/
 %{_libexecdir}/maxima
-%{_infodir}/*.info*
+%{_infodir}/*
 %{_mandir}/man1/maxima.*
-%{_datadir}/texmf/tex/latex/emaxima/
 %dir %{_datadir}/maxima/%{maxima_ver}/emacs
 %{_datadir}/maxima/%{maxima_ver}/emacs/emaxima.*
 %{_datadir}/maxima/%{maxima_ver}/emacs/*.el
@@ -347,6 +356,7 @@
 %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/*.el
 %ghost %{emacs_sitelisp}
 %ghost %{xemacs_sitelisp}
+%ghost %{texmf}/tex/latex/emaxima
 
 %files src
 %defattr(-,root,root,-)
@@ -385,6 +395,22 @@
 
 
 %changelog
+* Wed Dec 27 2006 Rex Dieter <rdieter[AT]fedoraproject.org. 5.11.0-3
+- updated xdg_utils patch (sent upstream)
+
+* Thu Dec 21 2006 Rex Dieter <rdieter[AT]fedoraproject.org> 5.11.0-2
+- %%triggerin -- tetex-latex (for emaxima.sty)
+- disable ppc builds (for now), sbcl/ppc is segfaulting (#220053)
+
+* Thu Dec 21 2006 Rex Dieter <rdieter[AT]fedoraproject.org> 5.11.0-1
+- maxima-5.11.0 (#220512)
+
+* Mon Dec 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.99-0.3.rc3
+- maxima-5.10.99rc3
+
+* Wed Dec 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.99-0.2.rc2
+- maxima-5.10.99rc2
+
 * Wed Dec 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-9
 - respin (for sbcl-1.0)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-6/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Sep 2006 15:18:06 -0000	1.9
+++ sources	27 Dec 2006 22:08:43 -0000	1.10
@@ -1,3 +1,3 @@
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
-1e7f5ecabf990f350c5f662f106d83b7  maxima-5.10.0.tar.gz
+d9ae353e8eba9b9d5686e119e59ab88c  maxima-5.11.0.tar.gz


--- maxima-5.10.0-xdg-utils.patch DELETED ---


--- maxima-5.9.4-sbcl-disable-debugger.patch DELETED ---


