- updated to 5.46.0

- updated info patch
- removed outdated utf8 patch

diff --git a/maxima-info.patch b/maxima-info.patch
index ebceae0a3f509c37a384618ce90665251b2bf99c..dd983d30b6e00f20ccd06f57ad6438789175b1d3 100644 (file)
--- a/maxima-info.patch
+++ b/maxima-info.patch
@@ -60,8 +60,8 @@
  @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
+--- maxima-5.46.0/share/template-standalone.texi.orig  2023-01-28 10:21:39.597112694 +0100
++++ maxima-5.46.0/share/template-standalone.texi       2023-01-28 10:24:44.079446601 +0100
 @@ -21,9 +21,9 @@
  @end macro
  @end ifinfo
@@ -70,10 +70,10 @@
 +@dircategory Scientific software:
  @direntry
 -* Package MYPACKAGE: (maxima)Maxima share package MYPACKAGE for foo bar baz quux.
-+* Package MYPACKAGE: (maxima) Maxima share package MYPACKAGE for foo bar baz quux
++* Package MYPACKAGE: (maxima).        Maxima share package MYPACKAGE for foo bar baz quux
  @end direntry
  
- @node Top, Introduction to MYTOPIC, (dir), (dir)
+ @node Top, Introduction to package MYPACKAGE, (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 @@
@@ -130,3 +130,17 @@
  @end direntry
  
  @node Top, Introduction to kovacicODE, (dir), (dir)
+--- maxima-5.46.0/share/contrib/symplectic_ode/symplectic_ode.texi.orig        2021-05-16 01:20:53.000000000 +0200
++++ maxima-5.46.0/share/contrib/symplectic_ode/symplectic_ode.texi     2023-01-28 14:45:42.237952409 +0100
+@@ -9,9 +9,9 @@
+ @end macro
+ @end ifinfo
+ 
+-@dircategory Mathematics/Maxima
++@dircategory Scientific software:
+ @direntry
+-* symplectic_ode: (maxima/symplectic_ode).           Maxima share package symplectic_ode for solving Hamilton's equations.
++* symplectic_ode: (maxima/symplectic_ode).    Maxima share package symplectic_ode for solving Hamilton's equations
+ @end direntry
+ 
+ @node Top, Introduction to symplectic_ode, (dir), (dir)

diff --git a/maxima.spec b/maxima.spec
index ee5c63e5b00b07695b5b0212d833cc0ffff4f564..65d08063b64814469aa78457fcf4c9afa3c9358c 100644 (file)
--- a/maxima.spec
+++ b/maxima.spec
@@ -5,21 +5,20 @@
 Summary:       Maxima Symbolic Computation Program
 Summary(pl.UTF-8):     Program do obliczeń symbolicznych Maxima
 Name:          maxima
-Version:       5.43.2
+Version:       5.46.0
 Release:       1
 Epoch:         1
-License:       GPL
+License:       GPL v2+
 Group:         Applications/Math
-Source0:       http://downloads.sourceforge.net/maxima/%{name}-%{version}.tar.gz
-# Source0-md5: ff334e89324dc4b1cd2aa89e1faaf436
+Source0:       https://downloads.sourceforge.net/maxima/%{name}-%{version}.tar.gz
+# Source0-md5: 3c01f1daa6936e11d8713fef7751d3fe
 Source2:       %{name}-mode-init.el
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-missed-files.patch
 Patch3:                x%{name}-doc.patch
 Patch4:                %{name}-install.patch
 Patch5:                %{name}-info-compressed.patch
-Patch6:                utf8.patch
-URL:           http://maxima.sourceforge.net/
+URL:           https://maxima.sourceforge.io/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: clisp
@@ -143,7 +142,6 @@ touch doc/info/{maximahtml.mk,category-macros.texi} src/{clisp,cmucl,gcl}-depend
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 %{__aclocal}
@@ -154,7 +152,7 @@ touch doc/info/{maximahtml.mk,category-macros.texi} src/{clisp,cmucl,gcl}-depend
        --enable-gettext \
        --with-emacs-prefix=%{_emacs_lispdir}/%{name}
 
-# TODO: --enable-lang-de[-utf8?] --enable-lang-es[-utf8?] --enable-lang-pt[-utf8?] --enable-lang-pt_BR[-utf8?]
+# TODO: --enable-lang-de --enable-lang-es --enable-lang-pt --enable-lang-pt_BR --enable-lang-ru
 # for localized info pages
 
 %{__make}
@@ -163,7 +161,8 @@ touch doc/info/{maximahtml.mk,category-macros.texi} src/{clisp,cmucl,gcl}-depend
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       %{!?with_emacs:emacsdir=/emacs}
 
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir*
 
@@ -173,7 +172,8 @@ install -Dp doc/man/ru/maxima.1 $RPM_BUILD_ROOT%{_mandir}/ru/man1/maxima.1
 install -d $RPM_BUILD_ROOT%{_emacs_lispdir}/site-start.d
 install %{SOURCE2} $RPM_BUILD_ROOT%{_emacs_lispdir}/site-start.d
 %else
-%{__rm} -r $RPM_BUILD_ROOT%{_emacs_lispdir}/%{name}
+%{__rm} -r $RPM_BUILD_ROOT/emacs
+%{__rm} -r $RPM_BUILD_ROOT%{_infodir}/imaxima.info*
 %endif
 
 %find_lang %{name}
@@ -195,6 +195,12 @@ rm -rf $RPM_BUILD_ROOT
 %update_mime_database
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir %{_infodir} >/dev/null 2>&1
 
+%post  -n emacs-maxima-pkg -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%postun        -n emacs-maxima-pkg -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
 %triggerin doc -- %{name} = %{epoch}:%{version}
 if [ -d %{_docdir}/%{name}-doc-%{version} ]; then
        ln -snf %{_docdir}/%{name}-doc-%{version} %{_datadir}/%{name}/%{version}/doc
@@ -211,7 +217,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog-5* README
+%doc AUTHORS COPYING README
 %attr(755,root,root) %{_bindir}/maxima
 %attr(755,root,root) %{_bindir}/rmaxima
 %dir %{_libdir}/%{name}
@@ -230,8 +236,8 @@ fi
 %{_datadir}/%{name}/%{version}/share
 %{_datadir}/%{name}/%{version}/tests
 %{_mandir}/man1/maxima.1*
+%lang(ru) %{_mandir}/de/man1/maxima.1*
 %lang(ru) %{_mandir}/ru/man1/maxima.1*
-%{_infodir}/imaxima.info*
 %{_infodir}/maxima.info*
 %{_infodir}/maxima-index.lisp
 # packages
@@ -239,6 +245,7 @@ fi
 %{_infodir}/drawutils.info*
 %{_infodir}/kovacicODE.info*
 %{_infodir}/logic.info*
+%{_infodir}/symplectic_ode.info*
 
 %files -n bash-completion-maxima
 %defattr(644,root,root,755)
@@ -268,6 +275,7 @@ fi
 %defattr(644,root,root,755)
 %{_emacs_lispdir}/%{name}
 %{_emacs_lispdir}/site-start.d/%{name}-mode-init.el
+%{_infodir}/imaxima.info*
 %endif
 
 %files doc

diff --git a/utf8.patch b/utf8.patch
deleted file mode 100644 (file)
index fc2aa0e..0000000
--- a/utf8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- maxima-5.43.2/interfaces/emacs/imaxima/imaxima.texi~       2020-05-19 09:16:24.000000000 +0200
-+++ maxima-5.43.2/interfaces/emacs/imaxima/imaxima.texi        2020-05-19 09:16:53.255802318 +0200
-@@ -108,7 +108,7 @@
- 
- 
- To do line breaking imaxima requires the LaTeX package @code{breqn}. This
--package is officially distributed by Morten Høgholm from
-+package is officially distributed by Morten Høgholm from
- @uref{http://www.ctan.org/tex-archive/macros/latex/contrib/mh} as mh.zip.
- 
- Alternatively, for the easy installation, you may download