diff --git a/flexmock-3.0.2-testsuite-ruby34-formatting.patch b/flexmock-3.0.1-testsuite-ruby34-formatting.patch similarity index 69% rename from flexmock-3.0.2-testsuite-ruby34-formatting.patch rename to flexmock-3.0.1-testsuite-ruby34-formatting.patch index b37f0dd..991e7b6 100644 --- a/flexmock-3.0.2-testsuite-ruby34-formatting.patch +++ b/flexmock-3.0.1-testsuite-ruby34-formatting.patch @@ -5,8 +5,9 @@ diff -urp flexmock.orig/test/partial_mock_test.rb flexmock/test/partial_mock_tes exception = assert_raises(NameError) do obj.mocked_method end -- assert_match(/undefined method `does_not_exist' for/, exception.message) -+ assert_match(/undefined method [`']does_not_exist' for/, exception.message) +- assert_match /undefined method `does_not_exist' for/, exception.message ++ assert_match /undefined method [`']does_not_exist' for/, exception.message end def test_it_checks_whether_mocks_are_forbidden_before_forwarding_the_call +Only in flexmock/test: partial_mock_test.rb~ diff --git a/flexmock-3.0.2-ruby34-string-literal-frozen.patch b/flexmock-3.0.2-ruby34-string-literal-frozen.patch deleted file mode 100644 index 8f12f6a..0000000 --- a/flexmock-3.0.2-ruby34-string-literal-frozen.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -urp '--exclude=*~' flexmock-3.0.2.orig/lib/flexmock/spy_describers.rb flexmock-3.0.2/lib/flexmock/spy_describers.rb ---- flexmock-3.0.2.orig/lib/flexmock/spy_describers.rb 2025-08-13 16:49:42.102930421 +0900 -+++ flexmock-3.0.2/lib/flexmock/spy_describers.rb 2025-08-13 16:56:27.493387656 +0900 -@@ -18,7 +18,7 @@ class FlexMock - end - - def describe_spy(spy, sym, args, kw, options, not_clause="") -- result = "expected " -+ result = "expected ".dup - result << FlexMock.format_call(sym, args, kw) - result << " to#{not_clause} be received by " << spy.inspect - result << times_description(options[:times]) -@@ -29,7 +29,7 @@ class FlexMock - end - - def describe_calls(spy) -- result = '' -+ result = ''.dup - if spy.flexmock_calls.empty? - result << "No messages have been received\n" - else -diff -urp '--exclude=*~' flexmock-3.0.2.orig/test/container_methods_test.rb flexmock-3.0.2/test/container_methods_test.rb ---- flexmock-3.0.2.orig/test/container_methods_test.rb 2025-08-13 16:49:41.505249913 +0900 -+++ flexmock-3.0.2/test/container_methods_test.rb 2025-08-13 18:12:33.787388043 +0900 -@@ -112,7 +112,7 @@ class TestFlexmockContainerMethods < Min - end - - def test_stubbing_a_string -- s = "hello" -+ s = "hello".dup - flexmock(:base, s, :length => 2) - assert_equal 2, s.length - end diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index be3040e..4a5e1e4 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -2,8 +2,8 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 3.0.2 -Release: 1%{?dist} +Version: 3.0.1 +Release: 3%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -11,9 +11,7 @@ Source1: %{gem_name}-%{version}-test-missing-files.tar.gz # Source1 is created fron Source2 Source2: flexmock-create-missing-test-files.sh # make testsuite compatible for ruby34 formatting change -Patch0: flexmock-3.0.2-testsuite-ruby34-formatting.patch -# Remove warnings for string literal being frozen in the future -Patch1: flexmock-3.0.2-ruby34-string-literal-frozen.patch +Patch0: flexmock-3.0.1-testsuite-ruby34-formatting.patch Requires: ruby(release) BuildRequires: ruby(release) @@ -39,10 +37,10 @@ This package contains documentation for %{name}. %setup -q -n %{gem_name}-%{version} -a 1 mv ../%{gem_name}-%{version}.gemspec . -mv flexmock/test . - -%patch -P0 -p1 -%patch -P1 -p1 +( +cd flexmock/test +%patch -P0 -p2 +) find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d' find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 @@ -71,7 +69,7 @@ popd rm -f %{buildroot}%{gem_cache} %check -cp -a test .%{gem_instdir} +cp -a flexmock/test .%{gem_instdir} pushd .%{gem_instdir} export RUBYOPT=-W:deprecated @@ -101,13 +99,6 @@ popd %{gem_docdir}/ %changelog -* Wed Aug 13 2025 Mamoru TASAKA - 3.0.2-1 -- 3.0.2 -- Fix warnigs for string literal being frozen in the future ruby - -* Fri Jul 25 2025 Fedora Release Engineering - 3.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - * Sat Jan 18 2025 Fedora Release Engineering - 3.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 9188481..c70812d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (flexmock-3.0.2.gem) = 07902e5641e2d014e626c1b64f65aeae493fff88ea4f7be42816e63f7609db92ff5fa3b1ad3010e6c352c88f81480667326d83257f55de17b388f3ab68ece827 -SHA512 (flexmock-3.0.2-test-missing-files.tar.gz) = 3660f0f4cdeab1f92d5b89a57217effdacfdf91fa80eea22fb0baa4bba99bed99b5a8f6c918fd6e008bd2c5d3005ec5a9bd18feb11d9c56c03b292a3a9cc3abd +SHA512 (flexmock-3.0.1.gem) = 3cc339d553b60b827ef970054a6afbb45b607697b74dca5850031bbf7520de9251092fe09f49a8c7c34aa49441080e847ac6a63bfc8e6124f2d2f10a14ac5734 +SHA512 (flexmock-3.0.1-test-missing-files.tar.gz) = f8567a323adbbafefd466b3f1024db2a4dc2ab4008bbd8cbd03c027c130492b317c8d0dbff9bfaef22cbbbe3313b7227291ab69b11ade290429beb14ce177cdc