From 7d12bbb99bee40188168523ff685b7e8e573ba17 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Tue, 12 Jun 2018 12:02:08 +0200 Subject: [PATCH] Use python3-lesscpy 0.13.0 Require python-lesscpy 0.13. with Python 3 fix and use py3-lesscpy to compile ipa.css. python2-lesscpy was the last Python 2 dependency. Fixes: https://pagure.io/freeipa/issue/7585 Signed-off-by: Christian Heimes Reviewed-By: Rob Crittenden --- freeipa.spec.in | 5 +++-- install/ui/util/make-css.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index 375a68697..fb29adee6 100755 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -159,8 +159,9 @@ BuildRequires: libsss_nss_idmap-devel >= 1.15.3 BuildRequires: rhino BuildRequires: libverto-devel BuildRequires: libunistring-devel -# /usr/bin/lesscpy is provided by Python 2 package -BuildRequires: python2-lesscpy +# 0.13.0: https://bugzilla.redhat.com/show_bug.cgi?id=1584773 +# 0.13.0-2: fix for missing dependency on python-six +BuildRequires: python3-lesscpy >= 0.13.0-2 %endif # ONLY_CLIENT # diff --git a/install/ui/util/make-css.sh b/install/ui/util/make-css.sh index 0091f839e..087a46961 100755 --- a/install/ui/util/make-css.sh +++ b/install/ui/util/make-css.sh @@ -22,5 +22,5 @@ set -o errexit DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -lesscpy -x $DIR/../less/ipa.less > $DIR/../css/ipa.css +py3-lesscpy -x $DIR/../less/ipa.less > $DIR/../css/ipa.css exit $?