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 5be6747..4ad9fd0 100644 --- a/SPECS/ipa.spec +++ b/SPECS/ipa.spec @@ -202,6 +202,7 @@ Source1: https://releases.pagure.org/freeipa/freeipa-%{version}%{?rc_vers %if %{NON_DEVELOPER_BUILD} %if 0%{?rhel} >= 8 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