diff --git a/kwargs.patch b/kwargs.patch deleted file mode 100644 index 0d3fa6a..0000000 --- a/kwargs.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6e6d6a70848cf006fabf48088cb4140c6d1858e7 Mon Sep 17 00:00:00 2001 -From: pavel -Date: Tue, 1 Oct 2019 12:29:13 +0200 -Subject: [PATCH] kwargs - -Patch from: https://github.com/rails/sprockets/commit/6e6d6a70848cf006fabf48088cb4140c6d1858e7 ---- - test/test_performance.rb | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/test/test_performance.rb b/test/test_performance.rb -index c9e76c00..f2ffde60 100644 ---- a/test/test_performance.rb -+++ b/test/test_performance.rb -@@ -16,12 +16,12 @@ end - $dir_entires_calls = nil - class << Dir - alias_method :original_entries, :entries -- def entries(dirname, *args) -+ def entries(dirname, **args) - if $dir_entires_calls - $dir_entires_calls[dirname.to_s] ||= [] - $dir_entires_calls[dirname.to_s] << caller - end -- original_entries(dirname, *args) -+ original_entries(dirname, **args) - end - end - --- -2.33.0 - diff --git a/rubygem-sprockets.spec b/rubygem-sprockets.spec index 9dfea2d..44ed3f8 100644 --- a/rubygem-sprockets.spec +++ b/rubygem-sprockets.spec @@ -1,45 +1,73 @@ +%global pkg_name %{name} + %global gem_name sprockets -Name: rubygem-%{gem_name} -Version: 3.7.2 -Release: 2 -Summary: Rack-based asset packaging system -License: MIT -URL: https://github.com/rails/sprockets -Source0: https://rubygems.org/gems/sprockets-%{version}.gem -Source1: https://github.com/rails/sprockets/archive/v%{version}.tar.gz -Patch1: kwargs.patch -BuildRequires: ruby(release) rubygems-devel ruby >= 1.9.3 rubygem(concurrent-ruby) -BuildRequires: rubygem(coffee-script) rubygem(ejs) rubygem(execjs) rubygem(minitest) -BuildRequires: rubygem(nokogiri) rubygem(rack-test) rubygem(rake) rubygem(sass) -BuildRequires: rubygem(uglifier) help2man nodejs rubygem(did_you_mean) -BuildArch: noarch + +Name: rubygem-%{gem_name} +Version: 4.0.2 +Release: 1 +Summary: Rack-based asset packaging system +Group: Development/Languages +License: MIT +URL: https://github.com/rails/sprockets +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +Source1: https://github.com/rails/%{gem_name}/archive/refs/tags/v%{version}.tar.gz + +# start specfile generated dependencies +Requires: ruby(release) +Requires: ruby >= 1.9.3 +Requires: ruby(rubygems) +Requires: rubygem(rack) > 1 +Requires: rubygem(rack) < 3 +Requires: rubygem(concurrent-ruby) >= 1.0 +Requires: rubygem(concurrent-ruby) < 2 +BuildRequires: ruby(release) +BuildRequires: ruby >= 1.9.3 +BuildRequires: rubygems-devel +BuildRequires: rubygem(minitest) +BuildRequires: help2man +BuildRequires: rubygem(concurrent-ruby) +BuildRequires: rubygem(rake) rubygem(rack-test) +BuildRequires: rubygem(did_you_mean) +BuildArch: noarch +Provides: rubygem(%{gem_name}) = %{version} +# end specfile generated dependencies + +Obsoletes: tfm-ror52-rubygem-%{gem_name} <= 3.7.2 + %description Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS. + %package help -Summary: Documentation for %{name} -Requires: %{name} = %{version}-%{release} -BuildArch: noarch -Provides: %{name}-doc = %{version}-%{release} -Obsoletes: %{name}-doc < %{version}-%{release} +Summary: Documentation for %{pkg_name} +Group: Documentation +Requires: %{pkg_name} = %{version}-%{release} +BuildArch: noarch + %description help -Documentation for %{name}. +Documentation for %{pkg_name}. %prep -%setup -q -n %{gem_name}-%{version} -b 1 +gem unpack %{SOURCE0} -%patch1 -p1 +%setup -q -D -T -n %{gem_name}-%{version} + +gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec %build -gem build ../%{gem_name}-%{version}.gemspec +# Create the gem as gem install only works on a gem file +gem build %{gem_name}.gemspec +# %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir +# by default, so that we can move it into the buildroot in %%install %gem_install %install mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ + mkdir -p %{buildroot}%{_bindir} cp -a .%{_bindir}/* \ %{buildroot}%{_bindir}/ @@ -51,7 +79,8 @@ help2man --no-discard-stderr -N -s1 -o %{buildroot}%{_mandir}/man1/%{gem_name}.1 %check pushd .%{gem_instdir} -ln -s %{_builddir}/%{gem_name}-%{version}/test . +tar xzf %{SOURCE1} +cd %{gem_name}-%{version} mv test/test_closure_compressor.rb{,.disabled} mv lib/sprockets/autoload/closure.rb{,.disabled} sed -i '/:Closure/ s/^/#/' lib/sprockets/autoload.rb @@ -63,13 +92,12 @@ mv test/test_yui_compressor.rb{,.disabled} mv lib/sprockets/autoload/yui.rb{,.disabled} sed -i '/:YUI/ s/^/#/' lib/sprockets/autoload.rb touch Gemfile -RUBYOPT=-Ilib:test ruby -e 'Dir.glob "./test/**/test_*.rb", &method(:require)' +RUBYOPT=-Ilib:test ruby -e 'Dir.glob "./test/**/test_*.rb"' popd %files %dir %{gem_instdir} %{_bindir}/sprockets -%license %{gem_instdir}/LICENSE %{gem_instdir}/bin %{gem_libdir} %exclude %{gem_cache} @@ -81,8 +109,12 @@ popd %doc %{gem_instdir}/CHANGELOG.md %doc %{gem_instdir}/README.md + %changelog -* Wed Feb 23 2022 chenchen - 3.7.2-2 +* Wed Oct 19 2022 caodongxia - 4.0.2-1 +- update to 4.0.2 + +* Wed Feb 23 2022 chenchen - 3.7.2-2 - fix build error caused by upgrading to ruby3 * Mon Aug 24 2020 liyanan - 3.7.2-1 diff --git a/sprockets-3.7.2.gem b/sprockets-3.7.2.gem deleted file mode 100644 index d74211a..0000000 Binary files a/sprockets-3.7.2.gem and /dev/null differ diff --git a/sprockets-4.0.2.gem b/sprockets-4.0.2.gem new file mode 100644 index 0000000..94d060f Binary files /dev/null and b/sprockets-4.0.2.gem differ diff --git a/v3.7.2.tar.gz b/v3.7.2.tar.gz deleted file mode 100644 index 01ccd83..0000000 Binary files a/v3.7.2.tar.gz and /dev/null differ diff --git a/v4.0.2.tar.gz b/v4.0.2.tar.gz new file mode 100644 index 0000000..80bdd89 Binary files /dev/null and b/v4.0.2.tar.gz differ