This commit is contained in:
jiangxinyu 2021-06-07 16:49:21 +08:00
parent 1cb16b52b0
commit a9a51b1ab6
5 changed files with 70 additions and 65 deletions

Binary file not shown.

BIN
actionview-6.0.3.4.gem Normal file

Binary file not shown.

View File

@ -1,23 +0,0 @@
From 5bbce6fccc541b9941628cda4eda1f84c5a909ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
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

View File

@ -1,71 +1,99 @@
# template: scl
%{?scl:%scl_package rubygem-%{gem_name}}
%{!?scl:%global pkg_name %{name}}
%global gem_name actionview %global gem_name actionview
%{?_with_bootstrap: %global bootstrap 1} %global gem_require_name %{gem_name}
%global bootstrap 1
Name: rubygem-%{gem_name} Name: %{?scl_prefix}rubygem-%{gem_name}
Version: 5.2.4.4 Version: 6.0.3.4
Release: 1 Release: 1
Summary: Rendering framework putting the V in MVC (part of Rails) Summary: Rendering framework putting the V in MVC (part of Rails)
License: MIT Group: Development/Languages
URL: http://rubyonrails.org License: MIT
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem URL: https://rubyonrails.org
Source1: https://github.com/rails/rails/archive/v5.2.4.4.tar.gz Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
Patch0: rubygem-actionview-5.1.2-Prevent-negative-IDs-in-output-of-inspect.patch
BuildRequires: ruby(release) rubygems-devel # start specfile generated dependencies
%if ! 0%{?bootstrap} Requires: %{?scl_prefix_ruby}ruby(release)
BuildRequires: rubygem(activesupport) = %{version} rubygem(activerecord) = %{version} Requires: %{?scl_prefix_ruby}ruby >= 2.5.0
BuildRequires: rubygem(actionpack) = %{version} rubygem(railties) = %{version} Requires: %{?scl_prefix_ruby}ruby(rubygems)
BuildRequires: rubygem(sqlite3) Requires: %{?scl_prefix}rubygem(activesupport) = 6.0.3.4
%endif Requires: %{?scl_prefix}rubygem(builder) >= 3.1
BuildArch: noarch Requires: %{?scl_prefix}rubygem(builder) < 4
Requires: %{?scl_prefix}rubygem(erubi) >= 1.4
Requires: %{?scl_prefix}rubygem(erubi) < 2
Requires: %{?scl_prefix}rubygem(rails-html-sanitizer) >= 1.1
Requires: %{?scl_prefix}rubygem(rails-html-sanitizer) < 2
Requires: %{?scl_prefix}rubygem(rails-html-sanitizer) >= 1.2.0
Requires: %{?scl_prefix}rubygem(rails-dom-testing) >= 2.0
Requires: %{?scl_prefix}rubygem(rails-dom-testing) < 3
BuildRequires: %{?scl_prefix_ruby}ruby(release)
BuildRequires: %{?scl_prefix_ruby}ruby >= 2.5.0
BuildRequires: %{?scl_prefix_ruby}rubygems-devel
BuildArch: noarch
Provides: %{?scl_prefix}rubygem(%{gem_name}) = %{version}
# end specfile generated dependencies
Obsoletes: tfm-ror52-rubygem-%{gem_name} <= 5.2.1
%description %description
Simple, battle-tested conventions and helpers for building web pages. Simple, battle-tested conventions and helpers for building web pages.
%package doc %package doc
Summary: Documentation for %{name} Summary: Documentation for %{pkg_name}
Requires: %{name} = %{version}-%{release} Group: Documentation
BuildArch: noarch Requires: %{?scl_prefix}%{pkg_name} = %{version}-%{release}
BuildArch: noarch
%description doc %description doc
Documentation for %{name}. Documentation for %{pkg_name}.
%prep %prep
%setup -q -c -T %{?scl:scl enable %{scl} - << \EOF}
%gem_install -n %{SOURCE0} gem unpack %{SOURCE0}
pushd .%{gem_instdir} %{?scl:EOF}
%patch0 -p2
popd %setup -q -D -T -n %{gem_name}-%{version}
%{?scl:scl enable %{scl} - << \EOF}
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
%{?scl:EOF}
%build %build
# Create the gem as gem install only works on a gem file
%{?scl:scl enable %{scl} - << \EOF}
gem build %{gem_name}.gemspec
%{?scl:EOF}
# %%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
%{?scl:scl enable %{scl} - << \EOF}
%gem_install
%{?scl:EOF}
%install %install
mkdir -p %{buildroot}%{gem_dir} mkdir -p %{buildroot}%{gem_dir}
cp -pa .%{gem_dir}/* \ cp -a .%{gem_dir}/* \
%{buildroot}%{gem_dir}/ %{buildroot}%{gem_dir}/
%if ! 0%{?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
popd
%endif
%files %files
%dir %{gem_instdir} %dir %{gem_instdir}
%license %{gem_instdir}/MIT-LICENSE
%{gem_libdir} %{gem_libdir}
%exclude %{gem_cache} %exclude %{gem_cache}
%{gem_spec} %{gem_spec}
%license %{gem_instdir}/MIT-LICENSE
%files doc %files doc
%doc %{gem_docdir} %doc %{gem_docdir}
%doc %{gem_instdir}/README.rdoc
%doc %{gem_instdir}/CHANGELOG.md %doc %{gem_instdir}/CHANGELOG.md
%doc %{gem_instdir}/README.rdoc
%changelog %changelog
* Mon Jun 07 2021 jiangxinyu <jiangxinyu@kylinos.cn> - 6.0.3.4-1
- Update to 6.0.3.4
* Mon Feb 8 2021sunguoshuai<sunguoshuai@huawei.com>- 5.2.4.4-1 * Mon Feb 8 2021sunguoshuai<sunguoshuai@huawei.com>- 5.2.4.4-1
- Upgrade to 5.2.4.4 - Upgrade to 5.2.4.4

Binary file not shown.