From: Jan Rękorajski <baggins@pld-linux.org>
Date: Tue, 19 May 2020 07:29:21 +0000 (+0200)
Subject: - up to 5.43.2
X-Git-Tag: auto/th/maxima-5.43.2-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=133d8cf7b8e67a2dd0afe50f5eff54726b0ddf42;p=packages%2Fmaxima.git

- up to 5.43.2
- fix non-unicode character in doc (breaks makeinfo)
---

diff --git a/maxima-info.patch b/maxima-info.patch
index 479806a..ebceae0 100644
--- a/maxima-info.patch
+++ b/maxima-info.patch
@@ -69,8 +69,8 @@
 -@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
+-* 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)
diff --git a/maxima-install.patch b/maxima-install.patch
index 889b972..92a4b34 100644
--- a/maxima-install.patch
+++ b/maxima-install.patch
@@ -11,7 +11,7 @@ diff -burNp maxima-5.17.0/common.mk maxima-5.17.0-dud/common.mk
  dochtmldir = $(docdir)/html
  docsharedir = $(docdir)/share
  demodir = $(verpkgdatadir)/demo
- emacsdir = $(verpkgdatadir)/emacs
+ emacsdir = $(EMACSDIR)
  sharedir = $(verpkgdatadir)/share
 -instsrcdir = $(verpkgdatadir)/src
 +instsrcdir = $(prefix)/src/@PACKAGE@-@VERSION@
diff --git a/maxima.spec b/maxima.spec
index 793fe51..ee5c63e 100644
--- a/maxima.spec
+++ b/maxima.spec
@@ -5,19 +5,20 @@
 Summary:	Maxima Symbolic Computation Program
 Summary(pl.UTF-8):	Program do obliczeń symbolicznych Maxima
 Name:		maxima
-Version:	5.41.0
-Release:	3
+Version:	5.43.2
+Release:	1
 Epoch:		1
 License:	GPL
 Group:		Applications/Math
 Source0:	http://downloads.sourceforge.net/maxima/%{name}-%{version}.tar.gz
-# Source0-md5:	972c51384d7895c88d78eb045c6aedb2
+# Source0-md5:	ff334e89324dc4b1cd2aa89e1faaf436
 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/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -142,6 +143,7 @@ touch doc/info/{maximahtml.mk,category-macros.texi} src/{clisp,cmucl,gcl}-depend
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__aclocal}
@@ -149,7 +151,8 @@ touch doc/info/{maximahtml.mk,category-macros.texi} src/{clisp,cmucl,gcl}-depend
 %{__autoconf}
 %configure \
 	--enable-clisp \
-	--enable-gettext
+	--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?]
 # for localized info pages
@@ -168,10 +171,9 @@ 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
+%{__rm} -r $RPM_BUILD_ROOT%{_emacs_lispdir}/%{name}
 %endif
 
 %find_lang %{name}
@@ -247,12 +249,13 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/xmaxima
 %{_datadir}/%{name}/%{version}/xmaxima
-%{_desktopdir}/xmaxima.desktop
+%{_desktopdir}/net.sourceforge.maxima.xmaxima.desktop
+%{_datadir}/metainfo/net.sourceforge.maxima.xmaxima.appdata.xml
 %{_infodir}/xmaxima.info*
 %{_datadir}/mime/packages/x-mac.xml
 %{_datadir}/mime/packages/x-maxima-out.xml
-%{_pixmapsdir}/maxima-new.png
-%{_pixmapsdir}/maxima-new.svg
+%{_pixmapsdir}/net.sourceforge.maxima.png
+%{_pixmapsdir}/net.sourceforge.maxima.svg
 %{_pixmapsdir}/text-x-maxima-out.svg
 %{_pixmapsdir}/text-x-maximasession.svg
 
diff --git a/utf8.patch b/utf8.patch
new file mode 100644
index 0000000..fc2aa0e
--- /dev/null
+++ b/utf8.patch
@@ -0,0 +1,11 @@
+--- 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