From 2f194b26e3060e9f0a62279f60ad1417dca43b63 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Dec 17 2019 04:03:40 +0000
Subject: Update to 1.99.12


---

diff --git a/.gitignore b/.gitignore
index 2e28bf8..e979e2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /TeXmacs-1.99.1-src.tar.gz
 /TeXmacs-1.99.5-src.tar.gz
 /TeXmacs-1.99.8-src.tar.gz
+/TeXmacs-1.99.12-src.tar.gz
diff --git a/TeXmacs-link.patch b/TeXmacs-link.patch
deleted file mode 100644
index 9d404e8..0000000
--- a/TeXmacs-link.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up TeXmacs-1.99.8-src/src/CMakeLists.txt.link TeXmacs-1.99.8-src/src/CMakeLists.txt
---- TeXmacs-1.99.8-src/src/CMakeLists.txt.link	2018-07-04 00:50:01.000000000 -0600
-+++ TeXmacs-1.99.8-src/src/CMakeLists.txt	2018-10-09 18:33:52.950806404 -0600
-@@ -1,13 +1,13 @@
- 
--add_library(texmacs_body ${TeXmacs_All_SRCS})
-+add_library(texmacs_body STATIC ${TeXmacs_All_SRCS})
- 
- add_executable (${TeXmacs_binary_name}
-   ./Texmacs/Texmacs/texmacs.cpp
- )
- 
- target_link_libraries (${TeXmacs_binary_name}
--  ${TeXmacs_Libraries}
-   texmacs_body
-+  ${TeXmacs_Libraries}
- )
- 
- #--------------------------------------------------------------------------------
-@@ -19,4 +19,4 @@ SET_TARGET_PROPERTIES(${TeXmacs_binary_n
-     RUNTIME_OUTPUT_DIRECTORY ${TEXMACS_BINARY_DIR}
- )
- 
--install(TARGETS ${TeXmacs_binary_name} DESTINATION lib/texmacs/TeXmacs/bin)
-\ No newline at end of file
-+install(TARGETS ${TeXmacs_binary_name} DESTINATION lib/texmacs/TeXmacs/bin)
diff --git a/TeXmacs.spec b/TeXmacs.spec
index b7c0149..3301963 100644
--- a/TeXmacs.spec
+++ b/TeXmacs.spec
@@ -1,6 +1,6 @@
 Name:           TeXmacs
-Version:        1.99.8
-Release:        5%{?dist}
+Version:        1.99.12
+Release:        1%{?dist}
 Summary:        Structured WYSIWYG scientific text editor
 License:        GPLv2+
 URL:            http://www.texmacs.org
@@ -33,8 +33,6 @@ BuildRequires:  /usr/bin/2to3
 BuildRequires:  /usr/bin/pathfix.py
 Provides:       texmacs = %{version}-%{release}
 Requires:       fig2ps
-# Fix link order, make libtexmacs_body static
-Patch0:         TeXmacs-link.patch
 # Use Guile 1.8
 Patch1:         TeXmacs-guile18.patch
 
@@ -75,10 +73,9 @@ TeXmacs font.
 
 %prep
 %setup -q -n TeXmacs-%{version}-src
-%patch0 -p1 -b .link
 %patch1 -p1 -b .guile18
-2to3 --write --nobackups plugins/mathematica/bin/realpath.py plugins/python/bin/tm_python plugins/sage/bin/tm_sage
-pathfix.py -i %{__python3} -p -n plugins/mathematica/bin/realpath.py plugins/python/bin/tm_python plugins/sage/bin/tm_sage
+2to3 --write --nobackups plugins
+pathfix.py -i %{__python3} -p -n plugins/mathematica/bin/realpath.py
 
 
 %build
@@ -88,11 +85,7 @@ pathfix.py -i %{__python3} -p -n plugins/mathematica/bin/realpath.py plugins/pyt
 
 %install
 %make_install
-mv %{buildroot}%{_datadir}/application_registry %{buildroot}%{_datadir}/application-registry
 desktop-file-validate %{buildroot}%{_datadir}/applications/texmacs.desktop
-mkdir -p %{buildroot}%{_datadir}/mime-info
-cp -p %{buildroot}%{_datadir}/TeXmacs/misc/mime/texmacs.keys %{buildroot}%{_datadir}/mime-info
-cp -p %{buildroot}%{_datadir}/TeXmacs/misc/mime/texmacs.mime %{buildroot}%{_datadir}/mime-info
 
 mkdir -p %{buildroot}%{_datadir}/icons/gnome/48x48/mimetypes
 cp %{buildroot}%{_datadir}/pixmaps/TeXmacs.xpm %{buildroot}%{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-text-texmacs.xpm
@@ -161,13 +154,11 @@ fi
 %{_datadir}/TeXmacs
 %exclude %{_datadir}/TeXmacs/examples/plugins
 %{_datadir}/applications/*
-%{_datadir}/application-registry/*
-%{_datadir}/mime-info/*
 %{_datadir}/mime/packages/*
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-text-texmacs.xpm
-%{_datadir}/icons/gnome/scalable/apps/TeXmacs.svg
-%{_datadir}/icons/gnome/scalable/mimetypes/text-texmacs.svg
+%{_datadir}/icons/gnome/scalable/apps/texmacs.svg
+%{_datadir}/icons/gnome/scalable/mimetypes/text-x-texmacs.svg
 
 %files devel
 %{_includedir}/*
@@ -177,6 +168,9 @@ fi
 
 
 %changelog
+* Mon Dec 16 2019 Orion Poplawski <orion@nwra.com> - 1.99.12-1
+- Update to 1.99.12
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.99.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index e023473..92efa47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (TeXmacs-1.99.8-src.tar.gz) = 4d2702e22d1a48f07c8a01fb60bd88a0f40fb4bf8cd931e8e8fc2936495fa4e9ed59680313a28ca4d1e2b383829dd428b917ce4ca4d17a0b18e3b1c236796c4e
+SHA512 (TeXmacs-1.99.12-src.tar.gz) = 2248f636f45f94315ac95d510462478f7e2b78b8e331eb5839bf74489aeda7ec6859fc4c3ae1dff20e1842b473b850d286474d692809ffa3f0f1cef62f6406b5