commit 2741c093e467778f841bae5ed1fbab50e435dca8
Author: Jakub Bogusz <[email protected]>
Date: Wed Dec 6 05:30:16 2017 +0100
- updated to 5.41.0
- updated info,info-compressed patches
- removed obsolete posix patch
- use upstream xmaxima desktop file and icon
- added emacs bcond
maxima-info-compressed.patch | 36 +++++++-----
maxima-info.patch | 125 ++++++++++++++++++++++++++++++++++++++++--
maxima-posix.patch | 20 -------
maxima.spec | 128 +++++++++++++++++++++++++++++++++----------
xmaxima.desktop | 8 ---
5 files changed, 239 insertions(+), 78 deletions(-)
---
diff --git a/maxima.spec b/maxima.spec
index 59c5f79..bec0e3d 100644
--- a/maxima.spec
+++ b/maxima.spec
@@ -1,28 +1,32 @@
+#
+# Conditional build:
+%bcond_without emacs # Emacs mode
+
Summary: Maxima Symbolic Computation Program
Summary(pl.UTF-8): Program do obliczeń symbolicznych Maxima
Name: maxima
-Version: 5.31.3
-Release: 5
+Version: 5.41.0
+Release: 1
Epoch: 1
License: GPL
Group: Applications/Math
-Source0: http://download.sourceforge.net/maxima/%{name}-%{version}.tar.gz
-# Source0-md5: 02b3b089b6a5581c410f3dcc57bfdde8
-Source1: x%{name}.desktop
+Source0:
http://downloads.sourceforge.net/maxima/%{name}-%{version}.tar.gz
+# Source0-md5: 972c51384d7895c88d78eb045c6aedb2
Source2: %{name}-mode-init.el
Patch0: %{name}-info.patch
Patch1: %{name}-missed-files.patch
-Patch2: %{name}-posix.patch
Patch3: x%{name}-doc.patch
Patch4: %{name}-install.patch
Patch5: %{name}-info-compressed.patch
URL: http://maxima.sourceforge.net/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: clisp
-BuildRequires: emacs
-BuildRequires: perl-base
-BuildRequires: python
+%{?with_emacs:BuildRequires: emacs}
+BuildRequires: gettext-tools
+BuildRequires: perl-base >= 5
+BuildRequires: python >= 2
+BuildRequires: rpmbuild(macros) >= 1.311
BuildRequires: texinfo
%requires_eq clisp
Requires: gzip
@@ -55,11 +59,25 @@ informacji na stronie http://www.ma.utexas.edu/maxima.html.
Ostatnio
udało mu się uzyskać pozwolenie DOE na opublikowanie Maximy na
licencji GPL.
+%package -n bash-completion-maxima
+Summary: Bash completion for Maxima
+Summary(pl.UTF-8): Bashowe dopełnianie parametrów dla Maximy
+Group: Applications/Shells
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: bash-completion >= 2.0
+
+%description -n bash-completion-maxima
+Bash completion for Maxima.
+
+%description -n bash-completion-maxima -l pl.UTF-8
+Bashowe dopełnianie parametrów dla Maximy.
+
%package xmaxima
Summary: Tcl/Tk GUI interface for Maxima
Summary(pl.UTF-8): Graficzny interfejs Tcl/Tk dla Maximy
Group: Applications/Math
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: shared-mime-info
Requires: tk
%description xmaxima
@@ -68,6 +86,19 @@ Tcl/Tk GUI interface for maxima.
%description xmaxima -l pl.UTF-8
Graficzny interfejs Tcl/Tk dla Maximy.
+%package -n bash-completion-xmaxima
+Summary: Bash completion for XMaxima
+Summary(pl.UTF-8): Bashowe dopełnianie parametrów dla XMaximy
+Group: Applications/Shells
+Requires: %{name}-xmaxima = %{epoch}:%{version}-%{release}
+Requires: bash-completion >= 2.0
+
+%description -n bash-completion-xmaxima
+Bash completion for XMaxima.
+
+%description -n bash-completion-xmaxima -l pl.UTF-8
+Bashowe dopełnianie parametrów dla XMaximy.
+
%package src
Summary: Maxima lisp source code
Summary(pl.UTF-8): Pliki źródłowe Maximy
@@ -104,11 +135,10 @@ Tryb Maximy dla Emacsa.
%prep
%setup -q
-# %patch0 -p1
+%patch0 -p1
%patch1 -p1
touch doc/info/{maximahtml.mk,category-macros.texi}
src/{clisp,cmucl,gcl}-depends.mk
-%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
@@ -118,24 +148,33 @@ touch doc/info/{maximahtml.mk,category-macros.texi}
src/{clisp,cmucl,gcl}-depend
%{__automake}
%{__autoconf}
%configure \
- --enable-clisp
+ --enable-clisp \
+ --enable-gettext
+
+# TODO: --enable-lang-de[-utf8?] --enable-lang-es[-utf8?]
--enable-lang-pt[-utf8?] --enable-lang-pt_BR[-utf8?]
+# for localized info pages
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d
$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_emacs_lispdir}/{,site-start.d}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_infodir}/dir*
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-cp -f $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/xmaxima/%{name}-icon.png \
- $RPM_BUILD_ROOT%{_pixmapsdir}
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%version/emacs
$RPM_BUILD_ROOT%{_emacs_lispdir}/%{name}
+install -Dp doc/man/ru/maxima.1 $RPM_BUILD_ROOT%{_mandir}/ru/man1/maxima.1
+
+%if %{with emacs}
+install -d $RPM_BUILD_ROOT%{_emacs_lispdir}/site-start.d
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs
$RPM_BUILD_ROOT%{_emacs_lispdir}/%{name}
install %{SOURCE2} $RPM_BUILD_ROOT%{_emacs_lispdir}/site-start.d
+%else
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/%{version}/emacs
+%endif
+
+%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -146,11 +185,13 @@ rm -rf $RPM_BUILD_ROOT
%postun -p /sbin/postshell
-/usr/sbin/fix-info-dir -c %{_infodir}
-%post xmaxima -p /sbin/postshell
--/usr/sbin/fix-info-dir -c %{_infodir}
+%post xmaxima
+%update_mime_database
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir %{_infodir}
>/dev/null 2>&1
-%postun xmaxima -p /sbin/postshell
--/usr/sbin/fix-info-dir -c %{_infodir}
+%postun xmaxima
+%update_mime_database
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir %{_infodir}
>/dev/null 2>&1
%triggerin doc -- %{name} = %{epoch}:%{version}
if [ -d %{_docdir}/%{name}-doc-%{version} ]; then
@@ -166,34 +207,61 @@ if [ -d %{_docdir}/%{name}-doc-%{version} -a \
ln -snf %{_docdir}/%{name}-doc-%{version}
%{_datadir}/%{name}/%{version}/doc
fi
-%files
+%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc ChangeLog README
+%doc AUTHORS COPYING ChangeLog-5* README
%attr(755,root,root) %{_bindir}/maxima
%attr(755,root,root) %{_bindir}/rmaxima
-%attr(755,root,root) %{_libdir}/%{name}
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/%{version}
+%attr(755,root,root) %{_libdir}/%{name}/%{version}/mgnuplot
+%dir %{_libdir}/%{name}/%{version}/binary-clisp
+%attr(755,root,root) %{_libdir}/%{name}/%{version}/binary-clisp/lisp.run
+%{_libdir}/%{name}/%{version}/binary-clisp/maxima.mem
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/%{version}
%{_datadir}/%{name}/%{version}/demo
%{_datadir}/%{name}/%{version}/share
%{_datadir}/%{name}/%{version}/tests
-%{_mandir}/man?/*
+%{_mandir}/man1/maxima.1*
+%lang(ru) %{_mandir}/ru/man1/maxima.1*
+%{_infodir}/imaxima.info*
%{_infodir}/maxima.info*
%{_infodir}/maxima-index.lisp
-%{_infodir}/imaxima.info*
+# packages
+%{_infodir}/abs_integrate.info*
+%{_infodir}/drawutils.info*
+%{_infodir}/kovacicODE.info*
+%{_infodir}/logic.info*
+
+%files -n bash-completion-maxima
+%defattr(644,root,root,755)
+%{_datadir}/bash-completion/completions/maxima
+%{_datadir}/bash-completion/completions/rmaxima
%files xmaxima
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/xmaxima
-%{_datadir}/maxima/%{version}/xmaxima
-%{_desktopdir}/*.desktop
+%{_datadir}/%{name}/%{version}/xmaxima
+%{_desktopdir}/xmaxima.desktop
%{_infodir}/xmaxima.info*
-%{_pixmapsdir}/*
+%{_datadir}/mime/packages/x-mac.xml
+%{_datadir}/mime/packages/x-maxima-out.xml
+%{_pixmapsdir}/maxima-new.png
+%{_pixmapsdir}/maxima-new.svg
+%{_pixmapsdir}/text-x-maxima-out.svg
+%{_pixmapsdir}/text-x-maximasession.svg
+
+%files -n bash-completion-xmaxima
+%defattr(644,root,root,755)
+%{_datadir}/bash-completion/completions/xmaxima
+%if %{with emacs}
%files -n emacs-maxima-pkg
%defattr(644,root,root,755)
%{_emacs_lispdir}/%{name}
%{_emacs_lispdir}/site-start.d/%{name}-mode-init.el
+%endif
%files doc
%defattr(644,root,root,755)
diff --git a/maxima-info-compressed.patch b/maxima-info-compressed.patch
index ebfb5d3..13a45b9 100644
--- a/maxima-info-compressed.patch
+++ b/maxima-info-compressed.patch
@@ -1,20 +1,26 @@
-diff -burNp maxima-5.17.0/src/cl-info.lisp maxima-5.17.0-dud/src/cl-info.lisp
---- maxima-5.17.0/src/cl-info.lisp 2008-04-30 21:55:36.000000000 +0200
-+++ maxima-5.17.0-dud/src/cl-info.lisp 2009-02-17 20:20:25.119541499 +0100
-@@ -198,12 +198,18 @@
- (byte-count (caddr value))
- (text (make-string byte-count))
- (path+filename (make-pathname :directory dir-name :name filename)))
+--- maxima-5.41.0/src/cl-info.lisp.orig 2017-12-05 18:40:03.114984028
+0100
++++ maxima-5.41.0/src/cl-info.lisp 2017-12-05 20:06:02.988258446 +0100
+@@ -207,15 +207,22 @@
+ (char-count (caddr value))
+ (text (make-string char-count))
+ (path+filename (merge-pathnames (make-pathname :name filename)
dir-name)))
+- (with-open-file (in path+filename :direction :input)
+ (unless (plusp byte-offset)
+ ;; If byte-offset isn't positive there must be some error in
+ ;; the index. Return nil and let the caller deal with it.
+ (return-from read-info-text nil))
+ (if (probe-file path+filename)
- (with-open-file (in path+filename :direction :input)
++ (with-open-file (in path+filename :direction :input)
(file-position in byte-offset)
- #+gcl (gcl-read-sequence text in :start 0 :end byte-count)
- #-gcl (read-sequence text in :start 0 :end byte-count))
-+ (with-open-stream (in (ext:run-shell-command (concatenate 'string
"gunzip -c " path+filename ".gz") :output :stream))
-+ (dotimes (ibytes byte-offset)
-+ (read-char in))
-+ #+gcl (gcl-read-sequence text in :start 0 :end byte-count)
-+ #-gcl (read-sequence text in :start 0 :end byte-count)))
+ (#-gcl read-sequence
+ #+gcl gcl-read-sequence
+ text in :start 0 :end char-count))
++ (with-open-stream (in (ext:run-shell-command (concatenate 'string "gunzip
-c " path+filename ".gz") :output :stream))
++ (dotimes (ibytes byte-offset)
++ (read-char in))
++ (#-gcl read-sequence
++ #+gcl gcl-read-sequence
++ text in :start 0 :end char-count)))
text))
#+gcl
diff --git a/maxima-info.patch b/maxima-info.patch
index dc1a660..479806a 100644
--- a/maxima-info.patch
+++ b/maxima-info.patch
@@ -1,17 +1,132 @@
-diff -burNp maxima-5.17.0/doc/info/include-maxima.texi.in
maxima-5.17.0-dud/doc/info/include-maxima.texi.in
---- maxima-5.17.0/doc/info/include-maxima.texi.in 2008-12-03
05:57:01.000000000 +0100
-+++ maxima-5.17.0-dud/doc/info/include-maxima.texi.in 2009-02-17
20:15:58.766974769 +0100
-@@ -21,9 +21,10 @@ This is a Texinfo Maxima Manual
+--- maxima-5.41.0/doc/info/include-maxima.texi.in.orig 2016-04-02
23:42:45.000000000 +0200
++++ maxima-5.41.0/doc/info/include-maxima.texi.in 2017-12-05
18:39:24.774984467 +0100
+@@ -39,10 +39,10 @@
Copyright 1994,2001 William F. Schelter
@format
+-INFO-DIR-SECTION Math
-START-INFO-DIR-ENTRY
-* Maxima: (maxima). A computer algebra system.
-END-INFO-DIR-ENTRY
+@dircategory Scientific software:
+@direntry
-+* Maxima: (maxima). A computer algebra system
++* Maxima: (maxima). A computer algebra system
++@end direntry
+ @end format
+
+ @macro var {expr}
+--- maxima-5.41.0/interfaces/emacs/imaxima/imaxima.texi.orig 2016-04-02
23:42:45.000000000 +0200
++++ maxima-5.41.0/interfaces/emacs/imaxima/imaxima.texi 2017-12-05
20:52:02.691560267 +0100
+@@ -9,9 +9,9 @@
+ @synindex fn cp
+ @synindex vr cp
+ @synindex pg cp
+-@dircategory Emacs
++@dircategory Emacs:
+ @direntry
+-* Imaxima: (imaxima). Image support for the computer algebra system Maxima.
Interactive math minor mode.
++* Imaxima: (imaxima). Image support for the computer algebra
system Maxima. Interactive math minor mode
+ @end direntry
+
+ @iftex
+--- maxima-5.41.0/interfaces/xmaxima/doc/xmaxima.texi.orig 2016-04-02
23:42:45.000000000 +0200
++++ maxima-5.41.0/interfaces/xmaxima/doc/xmaxima.texi 2017-12-05
20:53:04.221559565 +0100
+@@ -27,10 +27,10 @@
+ MA 02110-1301, USA.
+
+ @format
+-INFO-DIR-SECTION Math
+-START-INFO-DIR-ENTRY
+-* Xmaxima: (xmaxima). Graphical interface for Maxima.
+-END-INFO-DIR-ENTRY
++@dircategory Scientific software:
++@direntry
++* Xmaxima: (xmaxima). Graphical interface for Maxima
+@end direntry
@end format
@end ifinfo
+--- maxima-5.41.0/share/template.texi.orig 2017-09-28 03:41:16.000000000
+0200
++++ maxima-5.41.0/share/template.texi 2017-12-05 20:54:11.268225467 +0100
+@@ -28,9 +28,9 @@
+ @c @include NEXTTOPIC.texi
+
+
+-@dircategory Mathematics/Maxima
++@dircategory Scientific software:
+ @direntry
+-* MYTOPIC: (maxima/mytopic). Maxima share package MYTOPIC for foo
bar baz quux.
++* MYTOPIC: (maxima/mytopic). Maxima share package MYTOPIC for foo
bar baz quux
+ @end direntry
+
+ @menu
+--- maxima-5.41.0/share/template-standalone.texi.orig 2017-09-28
03:41:16.000000000 +0200
++++ maxima-5.41.0/share/template-standalone.texi 2017-12-05
20:54:36.038225183 +0100
+@@ -21,9 +21,9 @@
+ @end macro
+ @end ifinfo
+
+-@dircategory Mathematics/Maxima
++@dircategory Scientific software:
+ @direntry
+-* MYTOPIC: (maxima/mytopic). Maxima share package MYTOPIC for foo
bar baz quux.
++* MYTOPIC: (maxima/mytopic). Maxima share package MYTOPIC for foo
bar baz quux
+ @end direntry
+
+ @node Top, Introduction to MYTOPIC, (dir), (dir)
+--- maxima-5.41.0/share/contrib/integration/abs_integrate.texi.orig
2017-09-28 03:41:16.000000000 +0200
++++ maxima-5.41.0/share/contrib/integration/abs_integrate.texi 2017-12-05
20:55:44.868224398 +0100
+@@ -9,9 +9,9 @@
+ @end macro
+ @end ifinfo
+
+-@dircategory Mathematics/Maxima
++@dircategory Scientific software:
+ @direntry
+-* abs_integrate: (maxima/abs_integrate). Maxima share package
abs_integrate for integrating absolute value and friends.
++* abs_integrate: (maxima/abs_integrate). Maxima share package
abs_integrate for integrating absolute value and friends
+ @end direntry
+
+ @node Top, Introduction to abs_integrate, (dir), (dir)
+--- maxima-5.41.0/share/draw/drawutils.texi.orig 2017-09-28
03:41:16.000000000 +0200
++++ maxima-5.41.0/share/draw/drawutils.texi 2017-12-05 20:56:30.734890540
+0100
+@@ -13,9 +13,9 @@
+ @end macro
+ @end ifinfo
+
+-@dircategory Mathematics/Maxima
++@dircategory Scientific software:
+ @direntry
+-* drawutils: (maxima/drawutils). Maxima share package drawutils:
additional drawing functions for package draw.
++* drawutils: (maxima/drawutils). Maxima share package drawutils:
additional drawing functions for package draw
+ @end direntry
+
+ @node Top, Introduction to drawutils, (dir), (dir)
+--- maxima-5.41.0/share/logic/logic.texi.orig 2017-09-28 03:41:16.000000000
+0200
++++ maxima-5.41.0/share/logic/logic.texi 2017-12-05 20:56:58.058223562
+0100
+@@ -32,9 +32,9 @@
+ @end macro
+ @end ifinfo
+
+-@dircategory Mathematics/Maxima
++@dircategory Scientific software:
+ @direntry
+-* logic: (maxima/logic). Maxima share package logic for operations
on Boolean variables.
++* logic: (maxima/logic). Maxima share package logic for
operations on Boolean variables
+ @end direntry
+
+ @node Top, Introduction to logic, (dir), (dir)
+--- maxima-5.41.0/share/contrib/maxima-odesolve/kovacicODE.texi.orig
2017-09-28 03:41:16.000000000 +0200
++++ maxima-5.41.0/share/contrib/maxima-odesolve/kovacicODE.texi
2017-12-05 20:57:42.718223051 +0100
+@@ -13,9 +13,9 @@
+ @end ifinfo
+
+
+-@dircategory Mathematics/Maxima
++@dircategory Scientific software:
+ @direntry
+-* kovacicODE: (maxima/kovacicODE). Maxima share package kovacicODE:
Kovacic's method for differential equations.
++* kovacicODE: (maxima/kovacicODE). Maxima share package kovacicODE:
Kovacic's method for differential equations
+ @end direntry
+
+ @node Top, Introduction to kovacicODE, (dir), (dir)
diff --git a/maxima-posix.patch b/maxima-posix.patch
deleted file mode 100644
index 3883c1d..0000000
--- a/maxima-posix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- maxima-5.15.0.old/configure.in 2008-04-20 16:28:08.000000000 +0200
-+++ maxima-5.15.0/configure.in 2008-05-16 08:29:05.000000000 +0200
-@@ -707,12 +707,12 @@
- else
- tmp_exec_prefix="${exec_prefix}"
- fi
--expanded_top_srcdir="`(cd \"$top_srcdir\" 1>/dev/null 2>/dev/null; pwd)`"
-+expanded_top_srcdir="`(cd "$top_srcdir" 1>/dev/null 2>/dev/null; pwd)`"
- expanded_exec_prefix="${tmp_exec_prefix}"
--expanded_libdir="`eval \"exec_prefix=${tmp_exec_prefix};echo ${libdir}\"`"
--expanded_libexecdir="`eval \"exec_prefix=${tmp_exec_prefix};echo
${libexecdir}\"`"
--expanded_datadir="`eval
\"prefix=${tmp_prefix};datarootdir=${datarootdir};echo ${datadir}\"`"
--expanded_infodir="`eval
\"prefix=${tmp_prefix};datarootdir=${datarootdir};echo ${infodir}\"`"
-+expanded_libdir="`eval "exec_prefix=${tmp_exec_prefix};echo ${libdir}"`"
-+expanded_libexecdir="`eval "exec_prefix=${tmp_exec_prefix};echo
${libexecdir}"`"
-+expanded_datadir="`eval "prefix=${tmp_prefix};datarootdir=${datarootdir};echo
${datadir}"`"
-+expanded_infodir="`eval "prefix=${tmp_prefix};datarootdir=${datarootdir};echo
${infodir}"`"
-
- AC_SUBST(expanded_top_srcdir)
- AC_SUBST(expanded_exec_prefix)
diff --git a/xmaxima.desktop b/xmaxima.desktop
deleted file mode 100644
index 28057f9..0000000
--- a/xmaxima.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=XMaxima
-Exec=xmaxima
-Icon=maxima-icon
-Terminal=false
-Type=Application
-Categories=Education;Science;Math;
-# vi: encoding=utf-8
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/maxima.git/commitdiff/2741c093e467778f841bae5ed1fbab50e435dca8
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
