IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use old uglifyjs on RHEL 8

Browse Source 
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>
This commit is contained in:
Christian Heimes 2020-06-17 14:02:43 +02:00 committed by Florence Blanc-Renaud
parent 533ec75494
commit 6e3346f0a7
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
freeipa.spec.in
View File

@ -191,7 +191,12 @@ BuildRequires: libsss_idmap-devel
BuildRequires: libsss_certmap-devel BuildRequires: libsss_certmap-devel
BuildRequires: libsss_nss_idmap-devel >= %{sssd_version} BuildRequires: libsss_nss_idmap-devel >= %{sssd_version}
BuildRequires: nodejs(abi) BuildRequires: nodejs(abi)
# use old dependency on RHEL 8 for now
%if 0%{?rhel}
BuildRequires: uglify-js
%else
BuildRequires: python3-rjsmin BuildRequires: python3-rjsmin
%endif
BuildRequires: libverto-devel BuildRequires: libverto-devel
BuildRequires: libunistring-devel BuildRequires: libunistring-devel
# 0.13.0: https://bugzilla.redhat.com/show_bug.cgi?id=1584773 # 0.13.0: https://bugzilla.redhat.com/show_bug.cgi?id=1584773

13
install/ui/util/compile.sh
View File

@ -23,6 +23,9 @@ set -o errexit
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
RDIR=$DIR/../release RDIR=$DIR/../release
# for platform ID
. /etc/os-release
usage() { usage() {
cat <<-__EOF__; cat <<-__EOF__;
NAME NAME
@ -105,7 +108,13 @@ if [[ ! $OUTPUT_FILE ]] ; then
OUTPUT_FILE=$RDIR/$RELEASE/$LAYER.js OUTPUT_FILE=$RDIR/$RELEASE/$LAYER.js
fi 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 "Minimizing: $RDIR/$RELEASE/$LAYER.js"
echo "Target file: $OUTPUT_FILE" 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