diff --git a/activemodel-5.2.4.4.gem b/activemodel-5.2.4.4.gem
deleted file mode 100644
index 53e230c..0000000
Binary files a/activemodel-5.2.4.4.gem and /dev/null differ
diff --git a/activemodel-6.1.4.1-tests.txz b/activemodel-6.1.4.1-tests.txz
new file mode 100644
index 0000000..f21b2fe
Binary files /dev/null and b/activemodel-6.1.4.1-tests.txz differ
diff --git a/activemodel-6.1.4.1.gem b/activemodel-6.1.4.1.gem
new file mode 100644
index 0000000..dad3916
Binary files /dev/null and b/activemodel-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-activemodel.spec b/rubygem-activemodel.spec
index 69028e3..fe543ef 100644
--- a/rubygem-activemodel.spec
+++ b/rubygem-activemodel.spec
@@ -1,37 +1,55 @@
 %global gem_name activemodel
-%{?_with_bootstrap: %global bootstrap 1}
-%global bootstrap 1
-Name:                rubygem-%{gem_name}
-Version:             5.2.4.4
-Release:             1
-Summary:             A toolkit for building modeling frameworks (part of Rails)
-License:             MIT
-URL:                 http://rubyonrails.org
-Source0:             https://rubygems.org/gems/activemodel-5.2.4.4.gem
-Source1:             https://github.com/rails/rails/archive/v5.2.4.4.tar.gz
-BuildRequires:       ruby(release) rubygems-devel ruby >= 2.2.2 rubygem(activesupport) = %{version}
-%if ! 0%{?bootstrap}
-BuildRequires:       rubygem(railties) = %{version}
+
+%bcond_with bootstrap
+
+Name:		rubygem-%{gem_name}
+Version: 	6.1.4.1
+Release:	1
+Summary:	A toolkit for building modeling frameworks (part of Rails)
+License:	MIT
+URL:		http://rubyonrails.org
+Source0:	https://rubygems.org/gems/%{gem_name}-%{version}.gem
+# The gem doesn't ship with the test suite.
+# You may check it out like so
+# git clone https://github.com/rails/rails.git
+# cd rails/activemodel && git archive -v -o activemodel-6.1.4.1-tests.txz v6.1.4.1 test/
+Source1:	%{gem_name}-%{version}-tests.txz
+# The tools are needed for the test suite, are however unpackaged in gem file.
+# You may check it out like so
+# git clone http://github.com/rails/rails.git --no-checkout
+# cd rails && git archive -v -o rails-6.1.4.1-tools.txz v6.1.4.1 tools/
+Source2:	rails-%{version}-tools.txz
+
+BuildRequires:	ruby(release)
+BuildRequires:	rubygems-devel
+BuildRequires:	ruby >= 2.2.2
+BuildRequires:	rubygem(activesupport) = %{version}
+%if %{without bootstrap}
+BuildRequires:	rubygem(railties) = %{version}
 %endif
-BuildRequires:       rubygem(bcrypt) => 3.1.2 rubygem(builder)
-BuildArch:           noarch
+BuildRequires:	rubygem(bcrypt) => 3.1.2
+BuildRequires:	rubygem(builder)
+BuildArch:	noarch
+
 %description
 A toolkit for building modeling frameworks like Active Record. Rich support
 for attributes, callbacks, validations, serialization, internationalization,
 and testing.
 
-%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}
+%setup -q -n %{gem_name}-%{version} -b1 -b2
 
 %build
+gem build ../%{gem_name}-%{version}.gemspec
+%gem_install
 
 %install
 mkdir -p %{buildroot}%{gem_dir}
@@ -40,11 +58,13 @@ cp -a .%{gem_dir}/* \
 
 %check
 pushd .%{gem_instdir}
-tar xzvf %{SOURCE1}
-cd rails-%{version}/%{gem_name}
-%if 0%{?bootstrap}
+ln -s %{_builddir}/tools ..
+mv %{_builddir}/test .
+
+%if %{with bootstrap}
 mv ./test/cases/railtie_test.rb{,.disable}
 %endif
+
 ruby -Ilib:test -e "Dir.glob('./test/**/*_test.rb').sort.each {|t| require t}"
 popd
 
@@ -61,7 +81,10 @@ popd
 %doc %{gem_instdir}/README.rdoc
 
 %changelog
-* Mon Feb  8 2021sunguoshuai<sunguoshuai@huawei.com>- 5.2.4.4-1
+* Wed May  02 2022 wangkerong <wangkerong@h-partners.com>- 6.1.4.1-1
+- Upgrade to 6.1.4.1
+ 
+* Mon Feb  8 2021 sunguoshuai <sunguoshuai@huawei.com>- 5.2.4.4-1
 - Upgrade to 5.2.4.4
 
 * Sat Aug 8 2020 chengzihan <chengzihan2@huawei.com> - 5.2.3-1
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