diff --git a/rubygem-jquery-rails.spec b/rubygem-jquery-rails.spec index 6daf02e..8e020ab 100644 --- a/rubygem-jquery-rails.spec +++ b/rubygem-jquery-rails.spec @@ -4,9 +4,9 @@ # Unfortunately, lib/jquery/rails/version.rb specifies exact versions of # bundled jquery, so be specific with the require to keep this relieable. %global jquery1_version 1.12.4 -%global jquery1_system_version 1.12.4 +#%%global jquery1_system_version 1.12.4 %global jquery2_version 2.2.4 -%global jquery2_system_version 2.2.4 +#%%global jquery2_system_version 2.2.4 %global jquery3_version 3.1.1 %global jquery3_system_version 3.5.0 @@ -14,7 +14,8 @@ # jQuery {1,2}.x were dropped from Fedora. #%%global unbundle_jquery1 1 #%%global unbundle_jquery2 1 -%global unbundle_jquery3 1 +# jQuery 3.x is in newer version in Fedora. +#%%global unbundle_jquery3 1 Name: rubygem-%{gem_name} Version: 4.2.2 @@ -34,9 +35,9 @@ BuildRequires: web-assets-devel # FTBFS as soon as the version changes and will make somebody to notice and # possibly unbundle sooner. %{?unbundle_jquery1:BuildRequires: jquery = %{jquery1_version}} -%{!?unbundle_jquery1:BuildRequires: jquery = %{jquery1_system_version}} +#%%{!?unbundle_jquery1:BuildRequires: jquery = %{jquery1_system_version}} %{?unbundle_jquery2:BuildRequires: jquery = %{jquery2_version}} -%{!?unbundle_jquery2:BuildRequires: jquery = %{jquery2_system_version}} +#%%{!?unbundle_jquery2:BuildRequires: jquery = %{jquery2_system_version}} %{?unbundle_jquery3:BuildRequires: jquery = %{jquery3_version}} %{!?unbundle_jquery3:BuildRequires: jquery = %{jquery3_system_version}} BuildRequires: rubygem(activesupport) @@ -133,7 +134,8 @@ popd %changelog * Wed Aug 05 2020 Vít Ondruch - 4.2.2-10 -- jQuery {1,2}.x were dropped from Fedora while jQuery 3.x is not available. +- jQuery {1,2}.x were dropped from Fedora while jQuery 3.x available in + more recent version. Related: rhbz#1863662 Related: rhbz#1863663