Upgrade to 6.1.4.1
(cherry picked from commit 0969189a63b90c74e360ddb7e6306aadbdac7f78)
This commit is contained in:
parent
d8ed297f23
commit
76a5b8b515
Binary file not shown.
BIN
actionview-6.1.4.1-tests.txz
Normal file
BIN
actionview-6.1.4.1-tests.txz
Normal file
Binary file not shown.
BIN
actionview-6.1.4.1.gem
Normal file
BIN
actionview-6.1.4.1.gem
Normal file
Binary file not shown.
BIN
rails-6.1.4.1-tools.txz
Normal file
BIN
rails-6.1.4.1-tools.txz
Normal file
Binary file not shown.
@ -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
|
|
||||||
@ -1,55 +1,65 @@
|
|||||||
%global gem_name actionview
|
%global gem_name actionview
|
||||||
%{?_with_bootstrap: %global bootstrap 1}
|
%bcond_with bootstrap
|
||||||
%global bootstrap 1
|
|
||||||
Name: rubygem-%{gem_name}
|
Name: rubygem-%{gem_name}
|
||||||
Version: 5.2.4.4
|
Version: 6.1.4.1
|
||||||
Release: 2
|
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
|
License: MIT
|
||||||
URL: http://rubyonrails.org
|
URL: http://rubyonrails.org
|
||||||
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
|
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
|
||||||
Source1: https://github.com/rails/rails/archive/v5.2.4.4.tar.gz
|
Source1: %{gem_name}-%{version}-tests.txz
|
||||||
Patch0: rubygem-actionview-5.1.2-Prevent-negative-IDs-in-output-of-inspect.patch
|
Source2: rails-%{version}-tools.txz
|
||||||
BuildRequires: ruby(release) rubygems-devel
|
|
||||||
%if ! 0%{?bootstrap}
|
BuildRequires: ruby(release)
|
||||||
BuildRequires: rubygem(activesupport) = %{version} rubygem(activerecord) = %{version}
|
BuildRequires: rubygems-devel
|
||||||
BuildRequires: rubygem(actionpack) = %{version} rubygem(railties) = %{version}
|
%if %{without bootstrap}
|
||||||
BuildRequires: rubygem(sqlite3)
|
BuildRequires: rubygem(activesupport) = %{version}
|
||||||
|
BuildRequires: rubygem(activerecord) = %{version}
|
||||||
|
BuildRequires: rubygem(actionpack) = %{version}
|
||||||
|
BuildRequires: rubygem(railties) = %{version}
|
||||||
|
BuildRequires: rubygem(sqlite3)
|
||||||
%endif
|
%endif
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Simple, battle-tested conventions and helpers for building web pages.
|
Simple, battle-tested conventions and helpers for building web pages.
|
||||||
|
|
||||||
%package doc
|
|
||||||
Summary: Documentation for %{name}
|
%package doc
|
||||||
Requires: %{name} = %{version}-%{release}
|
Summary: Documentation for %{name}
|
||||||
BuildArch: noarch
|
Requires: %{name} = %{version}-%{release}
|
||||||
%description doc
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description doc
|
||||||
Documentation for %{name}.
|
Documentation for %{name}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -c -T
|
%setup -q -n %{gem_name}-%{version} -b1 -b2
|
||||||
%gem_install -n %{SOURCE0}
|
|
||||||
pushd .%{gem_instdir}
|
|
||||||
%patch0 -p2
|
|
||||||
popd
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
gem build ../%{gem_name}-%{version}.gemspec
|
||||||
|
%gem_install
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p %{buildroot}%{gem_dir}
|
mkdir -p %{buildroot}%{gem_dir}
|
||||||
cp -pa .%{gem_dir}/* \
|
cp -pa .%{gem_dir}/* \
|
||||||
%{buildroot}%{gem_dir}/
|
%{buildroot}%{gem_dir}/
|
||||||
%if ! 0%{?bootstrap}
|
|
||||||
|
|
||||||
|
%if %{without bootstrap}
|
||||||
%check
|
%check
|
||||||
ln -s %{gem_dir}/gems/activerecord-%{version}/ .%{gem_dir}/gems/activerecord
|
ln -s %{gem_dir}/gems/activerecord-%{version}/ .%{gem_dir}/gems/activerecord
|
||||||
|
|
||||||
pushd .%{gem_instdir}
|
pushd .%{gem_instdir}
|
||||||
tar xzvf %{SOURCE1} -C .
|
ln -s %{_builddir}/tools ..
|
||||||
cd rails-%{version}/%{gem_name}
|
mv %{_builddir}/test .
|
||||||
for t in {actionpack,activerecord,template}; do
|
|
||||||
ruby -Ilib:test -e "Dir.glob('./test/$t/**/*_test.rb').each {|t| require t}"
|
mv test/activerecord/controller_runtime_test.rb{,.disable}
|
||||||
done
|
|
||||||
|
find test -type f -name '*_test.rb' -print0 | \
|
||||||
|
sort -z | \
|
||||||
|
xargs -0 -n1 -i sh -c "echo '* Test file: {}'; ruby -Itest -- '{}' || exit 255"
|
||||||
|
|
||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -66,6 +76,9 @@ popd
|
|||||||
%doc %{gem_instdir}/CHANGELOG.md
|
%doc %{gem_instdir}/CHANGELOG.md
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 02 2022 wangkerong <wangkerong@h-partners.com>- 6.1.4.1-1
|
||||||
|
- Upgrade to 6.1.4.1
|
||||||
|
|
||||||
* Wed Aug 04 2021 wangyue <wangyue92@huawei.com> - 5.2.4.4-2
|
* Wed Aug 04 2021 wangyue <wangyue92@huawei.com> - 5.2.4.4-2
|
||||||
- revert to 5.2.4.4
|
- revert to 5.2.4.4
|
||||||
|
|
||||||
|
|||||||
BIN
v5.2.4.4.tar.gz
BIN
v5.2.4.4.tar.gz
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user