From b414ad3f2f9954f5025d9e3fcc661424bf9a8d97 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Mon, 5 Jul 2021 17:39:40 +0200
Subject: [PATCH] - Related: #1960650, updated create-clean-texlive.sh, dropped
 ps2pk from   source

---
 create-clean-texlive.sh | 27 +++++++++++++++++++++------
 sources                 |  2 +-
 texlive.spec            | 10 ++++++++--
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/create-clean-texlive.sh b/create-clean-texlive.sh
index bf0711f..501dc20 100755
--- a/create-clean-texlive.sh
+++ b/create-clean-texlive.sh
@@ -3,19 +3,34 @@ v=20200406
 s=texlive-$v-source.tar.xz
 p=${s%.tar.xz}
 
-echo create the clean texlive source, please wait...
 # get the texlive original source
 if [ ! -f $s ] ; then
-  wget http://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2020/$s
+  echo download $s, please wait...
+  wget https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2020/$s
   if [ ! -f $s ] ; then
     echo download $s failed!
     exit 1
   fi
 fi
-tar Jxf $s
+# remove old source
+if [ -d $p ] ; then
+  rm -fr $p
+fi
+
+echo extracting the $s...
+if ( ! tar Jxf $s ) ; then
+  echo $s failed, cannot be extracted
+  exit 1
+fi
+
 # remove files with bad licenses, don't embeded zziplib but build with system lib
-rm -f $p/libs/zziplib/zziplib-src/docs/zzipdoc/{options.py,match.py}
+rm -rf $p/libs/zziplib
+rm -rf $p/texk/ps2pk
 
 # create clean texlive source
-tar Jcvf $p-clean.tar.xz $p
-echo clean texlive source $p-clean.tar.xz is created.
+echo create the clean texlive source, please wait...
+if ( tar Jcf $p-clean.tar.xz $p) ; then
+  echo clean texlive source $p-clean.tar.xz is created.
+else
+  echo failed, clean texlive source $p-clean.tar.xz cannot be created.
+fi
diff --git a/sources b/sources
index 1e7c664..e524e54 100644
--- a/sources
+++ b/sources
@@ -592,7 +592,6 @@ SHA512 (relsize.tar.xz) = 90a4829b63d86214c44cadab6b9c9c114d6abfbd72dd4cd8bddb18
 SHA512 (sfmath.tar.xz) = 7ba73610785c9270e8741ba0137701677575e38cac79976d89e2f5768804ff52117c5fcbaab9b260be522f174458a18d2d70d82c2da201e7fd6a91fe4bbdf6fb
 SHA512 (xpatch.doc.tar.xz) = 49479d5a73beda78852f80f786e559caa49b51a44c79e73d689499429ee177ccc1a93064122c13e5cf4e34f00350df3e18fc131505364dd8cbf218e851249e8f
 SHA512 (xpatch.tar.xz) = d96d078066ee7cd39585754b0ed1aa2bd5680f90eb2a879bb2dcb47cfe834094f0b5fa1373ecd7f80f626c1a8a8fd4823525c33fa0e67f63b0beb4031a35956e
-SHA512 (texlive-20200406-source-clean.tar.xz) = 1ddae8bb0004b9b2759cca1feca2e663a761bd4f9e6e76be187538011af2efd28bd05f4cd251ba577859ba6e08b532960c5420001103739222c4072df6474d8b
 SHA512 (attachfile2.doc.tar.xz) = 4fd095f6091a0527962d95e40c85d3f3957371cef479f3f65d0f17d7047ab0540bab753e8be20897dcf7142c8c2fc93151c3e21b005bd7153635cfcdecfc0af3
 SHA512 (attachfile2.tar.xz) = b59dc5db5d56ea1615975144a9a91a0e188b52bae722311c4c9183857e0a34a542468b1fed47d389875f5c4adbb73fb1c19ef4e2d506391fe427042b208279a9
 SHA512 (awesomebox.doc.tar.xz) = eec717fa5bb5a0f0d15cfc39d2172f8818718f6c7037fe962a0e811c131cbc91d3f3167077ec413d565e6b0b782f5b3f77b38257caa6529a6f5db7da8e163c3d
@@ -703,3 +702,4 @@ SHA512 (xkeyval.doc.tar.xz) = 58a64143df3ca2cfd5b8260dbe5df4900586d3131f7914ea1d
 SHA512 (xkeyval.tar.xz) = 39ae2a2d595c6808aab31a1f97caf31418e8aad6c05bec8812b0fca4a69c19eeb88e559940f952309f69a4b2d6342cce804f7d4d2b6270878be51c9b3cdf4ee1
 SHA512 (xmltex.doc.tar.xz) = 340859a95a102759494222e0cbf19b7f851c44d4cfeac77cee178b69f576151021de53c32ffb8dcb8ed911dae2eecaac943941481b5cccdfb5302bb8291724fb
 SHA512 (xmltex.tar.xz) = e98a3ab9986d63d2605c87463bb32835d8ffcdd93f577b642da8e8f2447b6a74363c3a5799808c35f2e4b099af2789698ea471e04457a31ba8753ec4762e0ead
+SHA512 (texlive-20200406-source-clean.tar.xz) = cab1e03a89f5037c9bad81d5b1b23fc47ae52eec0a3886ecc5e7c302d7538ffe981913a4bc270fd74d6277a6c388c2d77f5ed723d54c85044cab036f58c5d129
diff --git a/texlive.spec b/texlive.spec
index fad444e..09a5b62 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -24,7 +24,7 @@
 
 Name: texlive
 Version: %{source_date}
-Release: 20%{?dist}
+Release: 21%{?dist}
 Epoch: %{tl_epoch}
 Summary: TeX formatting system
 Group: Applications/Publishing
@@ -89,7 +89,7 @@ Obsoletes: texlive-texmf-errata-latex < %{tl_epoch}:%{source_date}, texlive-texm
 
 Conflicts: texlive-dvips = 2007
 # Use create-clean-texlive.sh to generate clean tarball from released build tarballs, found here:
-# http://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2020/texlive-20200406-source.tar.xz
+# http://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2020/texlive-20200406-source.tar.xz 
 Source0: texlive-%{source_date}-source-clean.tar.xz
 Source1: macros.texlive
 Source2: texlive-licenses.tar.xz
@@ -24338,9 +24338,11 @@ done
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Werror=format-security"
 export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11 -fno-strict-aliasing -Werror=format-security"
+
 %if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
 export LDFLAGS="%{build_ldflags}"
 %endif
+
 cd source
 PREF=`pwd`/inst
 mkdir -p work
@@ -24378,6 +24380,7 @@ cd work
 	--disable-xindy \
 	--disable-xindy-docs \
 	--disable-xindy-make-rules \
+	--disable-ps2pk \
 	--enable-shared \
 	--enable-compiler-warnings=max \
 	--without-cxx-runtime-hack \
@@ -28378,6 +28381,9 @@ done <<< "$list"
 %{_texdir}/texmf-dist/doc/latex/xpatch/
 
 %changelog
+* Mon Jul 05 2021 Than Ngo <than@redhat.com> - 9:20200406-21
+- Related: #1960650, updated create-clean-texlive.sh, dropped ps2pk
+
 * Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 9:20200406-20
 - Rebuilt for RHEL 9 BETA for openssl 3.0
   Related: rhbz#1971065