From 2474cb6592ff5b2e64c3d14a3f594576f921bce1 Mon Sep 17 00:00:00 2001 From: Carl George Date: Mar 31 2021 21:43:50 +0000 Subject: Also use uglifyjs on CentOS Stream 8 --- diff --git a/SOURCES/0001-Also-use-uglifyjs-on-CentOS-Stream-8.patch b/SOURCES/0001-Also-use-uglifyjs-on-CentOS-Stream-8.patch new file mode 100644 index 0000000..61b74ed --- /dev/null +++ b/SOURCES/0001-Also-use-uglifyjs-on-CentOS-Stream-8.patch @@ -0,0 +1,30 @@ +From 3ab96a9d055e097860a6b18dce5242d231e39235 Mon Sep 17 00:00:00 2001 +From: Carl George +Date: Wed, 31 Mar 2021 16:26:09 -0500 +Subject: [PATCH] Also use uglifyjs on CentOS Stream 8 + +This conditional was recently changed to match VERSION_ID "8." to only +apply to RHEL 8 releases, but it should also match CentOS Stream 8 which +has VERSION_ID "8". + +https://pagure.io/freeipa/c/43f344b931db3f72f50e1620443be9f21623e29a +--- + install/ui/util/compile.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/install/ui/util/compile.sh b/install/ui/util/compile.sh +index 01a4e6e74..8f29b89ec 100755 +--- a/install/ui/util/compile.sh ++++ b/install/ui/util/compile.sh +@@ -112,7 +112,7 @@ fi + echo "Minimizing: $RDIR/$RELEASE/$LAYER.js" + echo "Target file: $OUTPUT_FILE" + if [[ ("$ID" == "rhel" || "$ID_LIKE" =~ "rhel") +- && "$VERSION_ID" =~ "8." ]]; ++ && ("$VERSION_ID" =~ "8." || "$VERSION_ID" == "8") ]]; + then + echo "Minifier: uglifyjs" + uglifyjs < $RDIR/$RELEASE/$LAYER.js > $OUTPUT_FILE +-- +2.30.2 + diff --git a/SPECS/ipa.spec b/SPECS/ipa.spec index 99de2e5..b890d63 100644 --- a/SPECS/ipa.spec +++ b/SPECS/ipa.spec @@ -207,6 +207,7 @@ Patch0008: 0008-ipatests-use-whole-date-when-calling-journalctl-sinc_rhbz#1 Patch0009: 0009-ipa-kdb-do-not-use-OpenLDAP-functions-with-NULL-LDAP_rhbz#1932784.patch Patch0010: 0010-ipa-client-install-output-a-warning-if-sudo-is-not-p_rhbz#1939371.patch Patch1001: 1001-Change-branding-to-IPA-and-Identity-Management.patch +Patch2000: 0001-Also-use-uglifyjs-on-CentOS-Stream-8.patch %endif %endif # RHEL spec file only: END