Compare commits

..

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
d32163a7ce
!13 升级到6.0.0版本解决编译失败
From: @lyn1001 
Reviewed-by: @jxy_git 
Signed-off-by: @jxy_git
2022-08-08 09:06:09 +00:00
openeuler-ci-bot
68c77c483c update to 6.0.0 2022-08-08 16:47:58 +08:00
openeuler-ci-bot
962547a788
!11 【轻量级 PR】:fix spec changelog date error
From: @ccdxx 
Reviewed-by: @jxy_git 
Signed-off-by: @jxy_git
2022-06-09 06:57:12 +00:00
chendexi
c7402cb18b
fix spec changelog date error 2022-06-09 06:42:15 +00:00
openeuler-ci-bot
64c920a9c4
!8 [sync] PR-7: update to 5.1.1
From: @openeuler-sync-bot 
Reviewed-by: @shinwell_hu 
Signed-off-by: @shinwell_hu
2022-03-07 03:16:02 +00:00
liqiuyu
ea21d77d79 update to 5.1.1
(cherry picked from commit 9746d9ac4e06728a8fc86dbd8948640963484de8)
2022-03-04 12:10:38 +08:00
openeuler-ci-bot
c9067b8c58 !2 fix CVE-2020-8151
From: @programmer12
Reviewed-by: @small_leek
Signed-off-by: @small_leek
2021-10-08 07:26:02 +00:00
programmer12
c42fd920f2 CVE-2020-8151 2021-10-08 15:11:12 +08:00
openeuler-ci-bot
a89cb90755 !1 Package init
Merge pull request !1 from 成子晗/master
2020-08-31 19:51:41 +08:00
chengzihan2
535dc39ce2 modify yaml 2020-08-31 17:30:38 +08:00
7 changed files with 26 additions and 61 deletions

Binary file not shown.

Binary file not shown.

BIN
activeresource-6.0.0.gem Normal file

Binary file not shown.

View File

@ -1,43 +0,0 @@
From 984181f2b26fe78c94f52d81aed72e25f3d16bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Thu, 1 Jun 2017 13:12:51 +0200
Subject: [PATCH] Always load 'abstract_unit' on the top of test file.
This helps to prevent issues such as:
~~~
+ ruby -Itest -e 'Dir.glob "./test/**/*_test.rb", &method(:require)'
/builddir/build/BUILD/activeresource-5.0.0/usr/share/gems/gems/activeresource-5.0.0/test/threadsafe_attributes_test.rb:1:in `<top (required)>': uninitialized constant ActiveSupport (NameError)
from /usr/share/rubygems/rubygems/core_ext/kernel_require.rb:55:in `require'
from /usr/share/rubygems/rubygems/core_ext/kernel_require.rb:55:in `require'
from -e:1:in `glob'
from -e:1:in `<main>'
~~~
---
test/cases/collection_test.rb | 2 ++
test/threadsafe_attributes_test.rb | 2 ++
2 files changed, 4 insertions(+)
diff --git a/test/cases/collection_test.rb b/test/cases/collection_test.rb
index 025d3ca..9722375 100644
--- a/test/cases/collection_test.rb
+++ b/test/cases/collection_test.rb
@@ -1,3 +1,5 @@
+require 'abstract_unit'
+
class CollectionTest < ActiveSupport::TestCase
def setup
@collection = ActiveResource::Collection.new
diff --git a/test/threadsafe_attributes_test.rb b/test/threadsafe_attributes_test.rb
index 7c3151d..e2459c7 100644
--- a/test/threadsafe_attributes_test.rb
+++ b/test/threadsafe_attributes_test.rb
@@ -1,3 +1,5 @@
+require 'abstract_unit'
+
class ThreadsafeAttributesTest < ActiveSupport::TestCase
class TestClass
--
2.12.2

View File

@ -1,22 +1,22 @@
%global gem_name activeresource
Name: rubygem-%{gem_name}
Epoch: 1
Version: 5.0.0
Version: 6.0.0
Release: 1
Summary: REST modeling framework (part of Rails)
License: MIT
URL: http://www.rubyonrails.org
Source0: https://rubygems.org/gems/activeresource-5.0.0.gem
Source1: https://github.com/rails/activeresource/archive/v5.0.0.tar.gz
Patch0: rubygem-activeresource-5.0.0-Always-load-abstract_unit-on-the-top-of-test-file.patch
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
Source1: %{gem_name}-%{version}-tests.tar.gz
BuildRequires: ruby(release) rubygems-devel ruby rubygem(activemodel) >= 5.0
BuildRequires: rubygem(activesupport) >= 5.0 rubygem(activemodel-serializers-xml)
BuildRequires: rubygem(bundler) rubygem(mocha)
BuildRequires: rubygem(activejob) rubygem(mocha) rubygem(rexml)
BuildArch: noarch
%description
REST on Rails. Wrap your RESTful web app with Ruby classes and work with them
like Active Record models.
%package doc
Summary: Documentation for %{name}
Requires: %{name} = %{epoch}:%{version}-%{release}
@ -25,12 +25,10 @@ BuildArch: noarch
Documentation for %{name}.
%prep
gem unpack %{SOURCE0}
%setup -q -D -T -n %{gem_name}-%{version}
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
%setup -q -n %{gem_name}-%{version} -b 1
%build
gem build %{gem_name}.gemspec
gem build ../%{gem_name}-%{version}.gemspec
%gem_install
%install
@ -39,26 +37,36 @@ cp -a .%{gem_dir}/* \
%{buildroot}%{gem_dir}/
%check
cp %{gem_name}.gemspec .%{gem_instdir}
pushd .%{gem_instdir}
tar xzvf %{SOURCE1}
cd %{gem_name}-%{version}
cat %{PATCH0} | patch -p1
echo 'gemspec' > Gemfile
sed -i '/rake/ s/^/#/' %{gem_name}.gemspec
ruby -Itest -e 'Dir.glob "./test/**/*_test.rb", &method(:require)'
# Move the tests into place
ln -s %{_builddir}/test test
# Bundler just complicates everything.
sed -i "/bundler/ s/^/#/" test/abstract_unit.rb
ruby -Ilib:test -e 'Dir.glob "./test/**/*_test.rb", &method(:require)'
popd
%files
%dir %{gem_instdir}
%license %{gem_instdir}/MIT-LICENSE
%{gem_libdir}
%exclude %{gem_cache}
%{gem_spec}
%files doc
%doc %{gem_docdir}
%doc %{gem_instdir}/README.rdoc
%doc %{gem_instdir}/README.md
%changelog
* Mon Aug 8 2022 liyanan <liyanan32@h-partners.cn> - 1:6.0.0-1
- update to 6.0.0
* Thu Mar 3 2022 liqiuyu <liqiuyu@kylinos.cn> - 1:5.1.1-1
- update to 5.1.1
* Fri Oct 8 2021 liwu <liwu13@huawei.com> - 5.0.0-2
- Fix CVE-2020-8151
* Wed Aug 12 2020 chengzihan <chengzihan2@huawei.com> - 5.0.0-1
- Package init

View File

@ -1,4 +1,4 @@
version_control: github
src_repo: rails/activeresource
tag_prefix: "v"
tag_prefix: "^v"
seperator: "."

Binary file not shown.