From 41e6ca442aabec7136a3509bfa111c582da210c7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 22 Jul 2020 12:15:04 +0800 Subject: [PATCH] used bundled jquery also bcond for system_jquery which should now be jquery3! --- ghc-pretty-show.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ghc-pretty-show.spec b/ghc-pretty-show.spec index 49952d7..15368bb 100644 --- a/ghc-pretty-show.spec +++ b/ghc-pretty-show.spec @@ -4,9 +4,11 @@ %global pkg_name pretty-show %global pkgver %{pkg_name}-%{version} +%bcond_with system_jquery + Name: ghc-%{pkg_name} Version: 1.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools for working with derived Show instances and generic inspection of values License: MIT @@ -26,9 +28,13 @@ BuildRequires: ghc-pretty-prof BuildRequires: ghc-text-prof BuildRequires: happy # End cabal-rpm deps -Requires: js-jquery1 +%if %{with system_jquery} +Requires: js-jquery # Make symlinks valid. BuildRequires: web-assets-devel +%else +Provides: bundled(jquery) = 3.3.1 +%endif %description We provide a library and an executable for working with derived 'Show' @@ -90,11 +96,12 @@ This package provides the Haskell %{pkg_name} profiling library. %ghc_lib_install # End cabal-rpm install +%if %{with system_jquery} %global _style_dir %{buildroot}%{_datadir}/%{pkgver}/style - # Replace shipped jQuery with system version. rm -v %{_style_dir}/jquery.js ln -s %{_webassetdir}/jquery/1/jquery.min.js %{_style_dir}/jquery.js +%endif %files -f %{name}.files @@ -121,6 +128,9 @@ ln -s %{_webassetdir}/jquery/1/jquery.min.js %{_style_dir}/jquery.js %changelog +* Wed Jul 22 2020 Jens Petersen - 1.10-2 +- used bundled jquery 3.3 + * Wed Jun 10 2020 Jens Petersen - 1.10-1 - update to 1.10