diff --git a/actionview-5.2.4.4.gem b/actionview-5.2.4.4.gem deleted file mode 100644 index 3a8d079..0000000 Binary files a/actionview-5.2.4.4.gem and /dev/null differ diff --git a/actionview-6.1.4.1-tests.txz b/actionview-6.1.4.1-tests.txz new file mode 100644 index 0000000..8b5bfc3 Binary files /dev/null and b/actionview-6.1.4.1-tests.txz differ diff --git a/actionview-6.1.4.1.gem b/actionview-6.1.4.1.gem new file mode 100644 index 0000000..dd82390 Binary files /dev/null and b/actionview-6.1.4.1.gem differ diff --git a/rails-6.1.4.1-tools.txz b/rails-6.1.4.1-tools.txz new file mode 100644 index 0000000..2a29578 Binary files /dev/null and b/rails-6.1.4.1-tools.txz differ diff --git a/rubygem-actionview-5.1.2-Prevent-negative-IDs-in-output-of-inspect.patch b/rubygem-actionview-5.1.2-Prevent-negative-IDs-in-output-of-inspect.patch deleted file mode 100644 index fb16f13..0000000 --- a/rubygem-actionview-5.1.2-Prevent-negative-IDs-in-output-of-inspect.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 5bbce6fccc541b9941628cda4eda1f84c5a909ad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?V=C3=ADt=20Ondruch?= -Date: Thu, 27 Apr 2017 15:18:56 +0200 -Subject: [PATCH] Prevent negative IDs in output of #inspect. - -https://bugs.ruby-lang.org/issues/13397 ---- - actionview/lib/action_view/template/resolver.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/actionview/lib/action_view/template/resolver.rb b/actionview/lib/action_view/template/resolver.rb -index d3905b5f23d5..7fdf04009a27 100644 ---- a/actionview/lib/action_view/template/resolver.rb -+++ b/actionview/lib/action_view/template/resolver.rb -@@ -56,7 +56,7 @@ def initialize - end - - def inspect -- "#<#{self.class.name}:0x#{(object_id << 1).to_s(16)} keys=#{@data.size} queries=#{@query_cache.size}>" -+ "#{to_s[0..-2]} keys=#{@data.size} queries=#{@query_cache.size}>" - end - - # Cache the templates returned by the block diff --git a/rubygem-actionview.spec b/rubygem-actionview.spec index f38e9b5..6cfe7f4 100644 --- a/rubygem-actionview.spec +++ b/rubygem-actionview.spec @@ -1,55 +1,65 @@ -%global gem_name actionview -%{?_with_bootstrap: %global bootstrap 1} -%global bootstrap 1 -Name: rubygem-%{gem_name} -Version: 5.2.4.4 -Release: 2 -Summary: Rendering framework putting the V in MVC (part of Rails) -License: MIT -URL: http://rubyonrails.org -Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -Source1: https://github.com/rails/rails/archive/v5.2.4.4.tar.gz -Patch0: rubygem-actionview-5.1.2-Prevent-negative-IDs-in-output-of-inspect.patch -BuildRequires: ruby(release) rubygems-devel -%if ! 0%{?bootstrap} -BuildRequires: rubygem(activesupport) = %{version} rubygem(activerecord) = %{version} -BuildRequires: rubygem(actionpack) = %{version} rubygem(railties) = %{version} -BuildRequires: rubygem(sqlite3) +%global gem_name actionview +%bcond_with bootstrap + +Name: rubygem-%{gem_name} +Version: 6.1.4.1 +Release: 1 +Summary: Rendering framework putting the V in MVC (part of Rails) +License: MIT +URL: http://rubyonrails.org +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +Source1: %{gem_name}-%{version}-tests.txz +Source2: rails-%{version}-tools.txz + +BuildRequires: ruby(release) +BuildRequires: rubygems-devel +%if %{without bootstrap} +BuildRequires: rubygem(activesupport) = %{version} +BuildRequires: rubygem(activerecord) = %{version} +BuildRequires: rubygem(actionpack) = %{version} +BuildRequires: rubygem(railties) = %{version} +BuildRequires: rubygem(sqlite3) %endif -BuildArch: noarch +BuildArch: noarch + %description Simple, battle-tested conventions and helpers for building web pages. -%package doc -Summary: Documentation for %{name} -Requires: %{name} = %{version}-%{release} -BuildArch: noarch -%description doc + +%package doc +Summary: Documentation for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc Documentation for %{name}. %prep -%setup -q -c -T -%gem_install -n %{SOURCE0} -pushd .%{gem_instdir} -%patch0 -p2 -popd +%setup -q -n %{gem_name}-%{version} -b1 -b2 %build +gem build ../%{gem_name}-%{version}.gemspec +%gem_install %install mkdir -p %{buildroot}%{gem_dir} cp -pa .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ -%if ! 0%{?bootstrap} +%if %{without bootstrap} %check ln -s %{gem_dir}/gems/activerecord-%{version}/ .%{gem_dir}/gems/activerecord + pushd .%{gem_instdir} -tar xzvf %{SOURCE1} -C . -cd rails-%{version}/%{gem_name} -for t in {actionpack,activerecord,template}; do - ruby -Ilib:test -e "Dir.glob('./test/$t/**/*_test.rb').each {|t| require t}" -done +ln -s %{_builddir}/tools .. +mv %{_builddir}/test . + +mv test/activerecord/controller_runtime_test.rb{,.disable} + +find test -type f -name '*_test.rb' -print0 | \ + sort -z | \ + xargs -0 -n1 -i sh -c "echo '* Test file: {}'; ruby -Itest -- '{}' || exit 255" + popd %endif @@ -66,6 +76,9 @@ popd %doc %{gem_instdir}/CHANGELOG.md %changelog +* Wed May 02 2022 wangkerong - 6.1.4.1-1 +- Upgrade to 6.1.4.1 + * Wed Aug 04 2021 wangyue - 5.2.4.4-2 - revert to 5.2.4.4 diff --git a/v5.2.4.4.tar.gz b/v5.2.4.4.tar.gz deleted file mode 100644 index 6191daf..0000000 Binary files a/v5.2.4.4.tar.gz and /dev/null differ