used bundled jquery
also bcond for system_jquery which should now be jquery3!
This commit is contained in:
parent
b9b8877dba
commit
41e6ca442a
@ -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 <petersen@redhat.com> - 1.10-2
|
||||
- used bundled jquery 3.3
|
||||
|
||||
* Wed Jun 10 2020 Jens Petersen <petersen@redhat.com> - 1.10-1
|
||||
- update to 1.10
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user