diff --git a/SPECS/texlive.spec b/SPECS/texlive.spec
index ea3fdc0..1ea49dd 100644
--- a/SPECS/texlive.spec
+++ b/SPECS/texlive.spec
@@ -24,7 +24,7 @@
 
 Name: texlive
 Version: %{source_date}
-Release: 22%{?dist}
+Release: 24%{?dist}
 Epoch: %{tl_epoch}
 Summary: TeX formatting system
 Group: Applications/Publishing
@@ -68,6 +68,8 @@ BuildRequires: mpfr-devel
 BuildRequires: chrpath
 BuildRequires: openssl-devel
 BuildRequires: multilib-rpm-config
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
 
 Requires: texlive-scheme-basic
 Requires: texlive-collection-latexrecommended
@@ -25316,8 +25318,11 @@ patch -p1 < %{_sourcedir}/texlive-20190410-tlmgr-ignore-warning.patch
 popd
 
 # adjust python3 shebang to make it point at #!%%{_python3}
-sed -i '1s=^#! /usr/bin/python3$=#!%{__python3}=' %{buildroot}%{_texdir}/texmf-dist/doc/xelatex/xepersian/*.py
-chmod 644  %{buildroot}%{_texdir}/texmf-dist/doc/xelatex/xepersian/*.py
+pushd %{buildroot}
+find -type f -exec sed -i '1s|^#!/usr/bin/python$|#!%{__python3}|' {} +
+find -type f -exec sed -i '1s|^#!/usr/bin/env python$|#!%{__python3}|' {} +
+sed -i '1s|^#!/usr/bin/python |#!%{__python3} |' ./%{_texdir}/texmf-dist/scripts/de-macro/de-macro
+popd
 
 # fix mangling shebang in scrips
 pushd  %{buildroot}%{_texdir}/texmf-dist/
@@ -27661,6 +27666,7 @@ done <<< "$list"
 %{_texdir}/texmf-dist/fonts/map/dvips/metapost/
 %{_texdir}/texmf-dist/fonts/tfm/metapost/
 %{_texdir}/texmf-dist/fonts/type1/metapost/
+%exclude %{_texdir}/texmf-dist/metapost/context/
 %{_texdir}/texmf-dist/metapost/
 %{_texdir}/texmf-dist/tex/generic/metapost/
 %doc %{_texdir}/texmf-dist/doc/metapost/
@@ -28028,6 +28034,8 @@ done <<< "$list"
 %{_mandir}/man1/mtxrun.1*
 %{_mandir}/man1/texexec.1*
 %{_texdir}/texmf-dist/bibtex/bst/context/
+%exclude %{_texdir}/texmf-dist/tex/context/third/pgf
+%exclude %{_texdir}/texmf-dist/scripts/context/perl/mptopdf.pl
 %{_texdir}/texmf-dist/context/
 %{_texdir}/texmf-dist/fonts/afm/hoekwater/context/contnav.afm
 %{_texdir}/texmf-dist/fonts/cid/fontforge/Adobe-CNS1-4.cidmap
@@ -28050,7 +28058,8 @@ done <<< "$list"
 %{_texdir}/texmf-dist/tex/generic/context/
 %{_texdir}/texmf-dist/tex/latex/context/
 %{fmtutil_cnf_d}/context
-%doc %{_texdir}/texmf-dist/doc/context/
+# move to texlive-extentions in EPEL
+%exclude %{_texdir}/texmf-dist/doc/context/
 
 %files auxhook
 %license lppl1.3.txt
@@ -28381,6 +28390,12 @@ done <<< "$list"
 %{_texdir}/texmf-dist/doc/latex/xpatch/
 
 %changelog
+* Sun Dec 12 2021 Than Ngo <than@redhat.com> - 9:20200406-24
+- Related: #2014453, fixed dependencies 
+
+* Tue Oct 19 2021 Than Ngo <than@redhat.com> - 9:20200406-23
+- Resolves: #2014453, runtime requirement on python-unversioned-command
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 9:20200406-22
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688