From 1029bba3565864ffe055186ec7899163d79e3af4 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 27 Jun 2018 13:53:07 -0400 Subject: [PATCH] Build using the py3-lesscpy command --- 0002-Use-python3-lesscpy-0.13.0.patch | 31 +++++++++++++++++++++++++++ freeipa.spec | 6 +++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0002-Use-python3-lesscpy-0.13.0.patch diff --git a/0002-Use-python3-lesscpy-0.13.0.patch b/0002-Use-python3-lesscpy-0.13.0.patch new file mode 100644 index 0000000..7e8569e --- /dev/null +++ b/0002-Use-python3-lesscpy-0.13.0.patch @@ -0,0 +1,31 @@ +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 +--- + install/ui/util/make-css.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +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 $? +-- +2.13.6 + diff --git a/freeipa.spec b/freeipa.spec index 613a021..3aaf31f 100644 --- a/freeipa.spec +++ b/freeipa.spec @@ -119,7 +119,7 @@ Name: freeipa Version: %{VERSION} -Release: 7%{?dist} +Release: 8%{?dist} Summary: The Identity, Policy and Audit system Group: System Environment/Base @@ -129,6 +129,7 @@ Source0: https://releases.pagure.org/freeipa/freeipa-%{VERSION}.tar.gz Source1: https://releases.pagure.org/freeipa/freeipa-%{VERSION}.tar.gz.asc Patch0001: 0001-Fedora-29-renamed-fedora-domainname.service.patch +Patch0002: 0002-Use-python3-lesscpy-0.13.0.patch # For the timestamp trick in patch application BuildRequires: diffstat @@ -1754,6 +1755,9 @@ fi %endif # with_ipatests %changelog +* Wed Jun 27 2018 Rob Crittenden - 4.6.90.pre2-8 +- Build UI using py3-lesscpy + * Tue Jun 19 2018 Rob Crittenden - 4.6.90.pre2-7 - *-domainname.service moved to the hostname package in F29 (#1592355)