diff --git a/root.spec b/root.spec index b92f433..7f2fc8f 100644 --- a/root.spec +++ b/root.spec @@ -70,7 +70,7 @@ Name: root Version: 6.26.04 %global libversion %(cut -d. -f 1-2 <<< %{version}) -Release: 3%{?dist} +Release: 4%{?dist} Summary: Numerical data analysis framework License: LGPLv2+ @@ -294,7 +294,12 @@ BuildRequires: protobuf-devel >= 3.0 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8 BuildRequires: python%{python3_pkgversion}-pandas %endif +%if %{?fedora}%{!?fedora:0} +BuildRequires: python3-rcssmin +BuildRequires: uglify-js +%else BuildRequires: yuicompressor +%endif BuildRequires: perl-generators BuildRequires: gtest-devel BuildRequires: gmock-devel @@ -2106,10 +2111,18 @@ unset QTINC # Minify script and style files for s in etc/notebook/JsMVA/js/*.js ; do +%if %{?fedora}%{!?fedora:0} + uglifyjs ${s} -c -m -o ${s%.js}.min.js +%else yuicompressor ${s} -o ${s%.js}.min.js +%endif done for s in etc/notebook/JsMVA/css/*.css ; do +%if %{?fedora}%{!?fedora:0} + python3 -m rcssmin < ${s} > ${s%.css}.min.css +%else yuicompressor ${s} -o ${s%.css}.min.css +%endif done # Avoid overlinking (this used to be the default with the old configure script) @@ -3973,6 +3986,9 @@ fi %endif %changelog +* Mon Jul 18 2022 Mattias Ellert - 6.26.04-4 +- Don't use yuicompressor on Fedora (Java no longer available on ix86) + * Sun Jul 03 2022 Mattias Ellert - 6.26.04-3 - Backport python 3.11 fixes from upstream - Backport additional python 3.11 fixes from CPyCppyy upstream