From 508eeccc66543bc2e2e99ae463dadd5b339cdcf9 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Wed, 26 Jun 2024 14:59:33 +0200
Subject: [PATCH] - Fixed eufm font mapping - Added missing license and fixed
 file list in texlive-plain Related: RHEL-34826

---
 texlive.spec | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/texlive.spec b/texlive.spec
index fa94c48..9d3a210 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -22,7 +22,7 @@
 
 Name: texlive
 Version: %{source_date}
-Release: 17%{?dist}
+Release: 18%{?dist}
 Epoch: %{tl_epoch}
 Summary: TeX formatting system
 Group: Applications/Publishing
@@ -25298,9 +25298,6 @@ cp -f %{buildroot}%{_texdir}/texmf-dist/tex/generic/config/language.us %{buildro
 # disable all hyphenations
 cp -f %{buildroot}%{_texdir}/texmf-dist/tex/generic/config/language.us.def %{buildroot}%{_texdir}/texmf-dist/tex/generic/config/language.def
 
-# disable all Maps/MixedMaps we add them by scriptlets
-sed -i '/^M/d' %{buildroot}%{_texdir}/texmf-dist/web2c/updmap.cfg
-
 # config files in /etc symlinked
 mkdir -p %{buildroot}%{_sysconfdir}/texlive/web2c
 mkdir -p %{buildroot}%{_sysconfdir}/texlive/dvips/config
@@ -25587,6 +25584,10 @@ done
 # And remove the rpath from this library.
 chrpath --delete %{buildroot}%{_libdir}/libptexenc.so.*
 
+# This map file provided by texlive-scripts is not useful and confuses lots of things when it ends up in pdftex.map
+# Renaming it should prevent it from being included
+mv %{buildroot}%{_texdir}/texmf-dist/fonts/map/dvips/tetex/dvipdfm35.map %{buildroot}%{_texdir}/texmf-dist/fonts/map/dvips/tetex/dvipdfm35.oldmap
+
 # SCRIPTLETS
 %pretrans base -p <lua>
 path = "/usr/share/texmf"
@@ -26164,7 +26165,7 @@ yes | %{_bindir}/updmap-sys --quiet --syncwithtrees >/dev/null 2>&1 || :
 %{_texdir}/texmf-dist/dvips/config/qms.cfg
 %{_texdir}/texmf-dist/dvips/config/toshiba.cfg
 %{_texdir}/texmf-dist/fonts/enc/dvips/base/
-%{_texdir}/texmf-dist/fonts/map/dvips/
+%dir %{_texdir}/texmf-dist/fonts/map/dvips/
 %{_texdir}/texmf-dist/tex/generic/dvips/
 %doc %{_texdir}/texmf-dist/doc/dvips/
 
@@ -26311,8 +26312,11 @@ yes | %{_bindir}/updmap-sys --quiet --syncwithtrees >/dev/null 2>&1 || :
 %doc %{_texdir}/texmf-dist/doc/pdftex/
 
 %files plain
+%license knuth.txt
 %{_texdir}/texmf-dist/makeindex/plain/
-%{_texdir}/texmf-dist/tex/plain/
+%dir %{_texdir}/texmf-dist/tex/plain/
+%{_texdir}/texmf-dist/tex/plain/base/
+%{_texdir}/texmf-dist/tex/plain/config/
 
 %files tex
 %license knuth.txt
@@ -28327,6 +28331,11 @@ yes | %{_bindir}/updmap-sys --quiet --syncwithtrees >/dev/null 2>&1 || :
 %{_texdir}/texmf-dist/tex/luatex/lua-uni-algos
 
 %changelog
+* Wed Jun 26 2024 Than Ngo <than@redhat.com> - 12:20230311-18
+- Fixed eufm font mapping
+- Added missing license and fixed file list in texlive-plain
+Related: RHEL-34826
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 12:20230311-17
 - Bump release for June 2024 mass rebuild