From 6e3346f0a7d820cb3643044884657fa60a80f918 Mon Sep 17 00:00:00 2001
From: Christian Heimes <cheimes@redhat.com>
Date: Jun 19 2020 06:40:15 +0000
Subject: Use old uglifyjs on RHEL 8


RHEL 8 buildroot does not have python3-rjsmin yet. Fall back to
uglifyjs.

See: https://pagure.io/freeipa/issue/8300
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>

---

diff --git a/freeipa.spec.in b/freeipa.spec.in
index 49c22c3..d65bfe1 100755
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -191,7 +191,12 @@ BuildRequires:  libsss_idmap-devel
 BuildRequires:  libsss_certmap-devel
 BuildRequires:  libsss_nss_idmap-devel >= %{sssd_version}
 BuildRequires:  nodejs(abi)
+# use old dependency on RHEL 8 for now
+%if 0%{?rhel}
+BuildRequires:  uglify-js
+%else
 BuildRequires:  python3-rjsmin
+%endif
 BuildRequires:  libverto-devel
 BuildRequires:  libunistring-devel
 # 0.13.0: https://bugzilla.redhat.com/show_bug.cgi?id=1584773
diff --git a/install/ui/util/compile.sh b/install/ui/util/compile.sh
index 1516b81..49c9dd8 100755
--- a/install/ui/util/compile.sh
+++ b/install/ui/util/compile.sh
@@ -23,6 +23,9 @@ set -o errexit
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 RDIR=$DIR/../release
 
+# for platform ID
+. /etc/os-release
+
 usage() {
 cat <<-__EOF__;
 NAME
@@ -105,7 +108,13 @@ if [[ ! $OUTPUT_FILE ]] ; then
     OUTPUT_FILE=$RDIR/$RELEASE/$LAYER.js
 fi
 
-# compile using python rjsmin
+# compile using python rjsmin on most platforms and uglify-js on RHEL 8
 echo "Minimizing: $RDIR/$RELEASE/$LAYER.js"
 echo "Target file: $OUTPUT_FILE"
-${PYTHON:-python3} -m rjsmin < $RDIR/$RELEASE/$LAYER.js > $OUTPUT_FILE
+if [ $ID = "rhel" ]; then
+    echo "Minifier: uglifyjs"
+    uglifyjs < $RDIR/$RELEASE/$LAYER.js > $OUTPUT_FILE
+else
+    echo "Minifier: rjsmin"
+    ${PYTHON:-python3} -m rjsmin < $RDIR/$RELEASE/$LAYER.js > $OUTPUT_FILE
+fi