Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0

rmagick-create-full-tarball.sh

@@ -6,6 +6,16 @@ then
   exit 1
 fi
 
+preserve_timestamps()
+{
+	while read f
+	do
+		unixtime=$(git log -n 1 --pretty='%ct' -- $f)
+		touch -d "@${unixtime}" $f
+	done < <(git ls-tree -r --name-only HEAD)
+
+}
+
 set -x
 set -e
 
@@ -30,6 +40,7 @@ VERSION_TAG=RMagick_${VERSION_TAG}
 git clone https://github.com/rmagick/$NAME.git
 pushd ${NAME}
 git reset --hard ${VERSION_TAG}
+preserve_timestamps
 popd
 
 ln -sf ${NAME} ${NAME}-${VERSION}

rmagick-pr1434-fix-test-with-IM-6_9_13_4.patch

@@ -1,26 +0,0 @@
-From 3430911fdecb467511f96ae9858bc89c8cd3c24a Mon Sep 17 00:00:00 2001
-From: Watson <watson1978@gmail.com>
-Date: Sat, 20 Jan 2024 17:44:08 +0900
-Subject: [PATCH] CI: Update ImageMagick 6
-
----
- .github/workflows/ci.yml                           | 6 +++---
- spec/rmagick/class_methods/limit_resources_spec.rb | 3 ++-
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/spec/rmagick/class_methods/limit_resources_spec.rb b/spec/rmagick/class_methods/limit_resources_spec.rb
-index d27a5a299..42ed8bc34 100644
---- a/spec/rmagick/class_methods/limit_resources_spec.rb
-+++ b/spec/rmagick/class_methods/limit_resources_spec.rb
-@@ -30,9 +30,10 @@
-     expect(new).to eq(500)
-     described_class.limit_resource(:file, cur)
- 
-+    expect { described_class.limit_resource(:time, 123) }.not_to raise_error
-     expect { cur = described_class.limit_resource(:time, 300) }.not_to raise_error
-     expect(cur).to be_kind_of(Integer)
--    expect(cur > 300).to be(true)
-+    expect(cur).to eq(123)
-     expect { new = described_class.limit_resource('time') }.not_to raise_error
-     expect(new).to eq(300)
-     described_class.limit_resource(:time, cur)

rmagick-pr1435-fix-test-with-IM-7_1_1_26.patch

@@ -1,23 +0,0 @@
-From 023c6de618236b921e488214b43dc263bf39b659 Mon Sep 17 00:00:00 2001
-From: Watson <watson1978@gmail.com>
-Date: Sun, 21 Jan 2024 15:41:28 +0900
-Subject: [PATCH] CI: Update ImageMagick 7 outside Windows
-
----
- .github/workflows/ci.yml         | 4 ++--
- spec/rmagick/image/gamma_spec.rb | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/spec/rmagick/image/gamma_spec.rb b/spec/rmagick/image/gamma_spec.rb
-index f57f35017..1603b1b18 100644
---- a/spec/rmagick/image/gamma_spec.rb
-+++ b/spec/rmagick/image/gamma_spec.rb
-@@ -4,7 +4,7 @@
- 
-     expect { image.gamma }.not_to raise_error
-     expect(image.gamma).to be_instance_of(Float)
--    expect(image.gamma).to eq(0.45454543828964233)
-+    expect(image.gamma).to be_within(0.0000001).of(0.4545454)
-     expect { image.gamma = 2.0 }.not_to raise_error
-     expect(image.gamma).to eq(2.0)
-     expect { image.gamma = 'x' }.to raise_error(TypeError)

rubygem-rmagick.spec

@@ -8,8 +8,8 @@ Requires:		(ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\
 %{nil}
 
 Name:		rubygem-%{gem_name}
-Version:	5.3.0
-Release:	3%{?dist}
+Version:	6.1.5
+Release:	2%{?dist}
 
 Summary:	Ruby binding to ImageMagick
 # SPDX confirmed
@@ -19,26 +19,26 @@ Source0:	https://rubygems.org/gems/%{gem_name}-%{version}.gem
 # %%{SOURCE2} %%{version}
 Source1:	rubygem-%{gem_name}-%{version}-full.tar.gz
 Source2:	rmagick-create-full-tarball.sh
-# https://github.com/rmagick/rmagick/pull/1434
-Patch0:	rmagick-pr1434-fix-test-with-IM-6_9_13_4.patch
-# https://github.com/rmagick/rmagick/pull/1435
-Patch1:	rmagick-pr1435-fix-test-with-IM-7_1_1_26.patch
 
-BuildRequires:	gcc
+BuildRequires:	gcc-c++
 BuildRequires:	rubygems-devel 
 BuildRequires:	ruby-devel
 BuildRequires:	rubygem(pkg-config)
+BuildRequires:	rubygem(observer)
 BuildRequires:	rubygem(test-unit)
 BuildRequires:	rubygem(rspec)
 BuildRequires:	rubygem(pry)
-# Due to test/RMagick/rmmain.c test_Magick_version(), for now
+# Due to ext/RMagick/rmmain.cpp test_Magick_version(), for now
 # we specify the exact version for ImageMagick
+#
+# With rmagick <= 5.5.0, ImageMagick X.Y.Z should all match,
+# with rmagick >= 6.0.0, ImageMagick X.Y should match.
 %if 0%{?fedora}
-%setIMver 40 1:7.1.1 1:7.1.2
-%setIMver 39 1:7.1.1 1:7.1.2
-%setIMver 38 1:7.1.1 1:7.1.2
-%setIMver 37 1:6.9.12 1:6.9.13
-%setIMver 36 1:6.9.12 1:6.9.13
+%setIMver 45 1:7.1 1:7.2
+%setIMver 44 1:7.1 1:7.2
+%setIMver 43 1:7.1 1:7.2
+%setIMver 42 1:7.1 1:7.2
+%setIMver 41 1:7.1 1:7.2
 %endif
 
 Obsoletes:	ruby-RMagick < 2.13.2
@@ -64,20 +64,9 @@ Documentation for %{name}.
 %setup -q -T -n %{gem_name}-%{version} -b 1
 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
 
-%patch -P0 -p1
-%patch -P1 -p1
-
 # permission
 find . -name \*.rb -or -name \*.gif | xargs chmod ugo-x 
 
-# kill rpath
-sed -i ext/RMagick/extconf.rb \
-    -e '\@LDFLAGS@s|[ \t]*-Wl,-rpath,[^ \t][^ \t]*"|"|'
-
-# kill gcc optflags suppressing warnings
-sed -i ext/RMagick/extconf.rb \
-    -e "\@-std=gnu99@s|-Wno[^ \t'][^ \t']*||g"
-
 %build
 export MAKE="make %{?_smp_mflags}"
 # Make sure that .so is to be created newly
@@ -145,6 +134,7 @@ done
 
 %{gem_libdir}/
 %{gem_extdir_mri}/
+%{gem_instdir}/sig/
 %exclude %{gem_cache}
 %{gem_spec}
 
@@ -155,6 +145,72 @@ done
 %doc	%{gem_instdir}/examples/
 
 %changelog
+* Thu Jan 08 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.1.5-2
+- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0
+
+* Sun Dec 28 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.1.5-1
+- 6.1.5
+
+* Wed Oct 29 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.1.4-2
+- Apply upstream patch for ruby3_5 Ractor change for testsuite
+
+* Sun Aug 24 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.1.4-1
+- 6.1.4
+
+* Sun Aug 17 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.1.3-1
+- 6.1.3
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jul 20 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.1.2-1
+- 6.1.2
+
+* Sun Feb 02 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.1.1-1
+- 6.1.1
+
+* Sun Jan 19 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.1.0-1
+- 6.1.0
+
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Tue Jan 07 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.0.1-4
+- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4
+
+* Sat Nov 02 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.0.1-3
+- Add BR: rubygem(observer) explicitly
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu May 16 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.0.1-1
+- 6.0.1
+
+* Fri May 03 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.0.0-1
+- 6.0.0
+
+* Mon Apr 08 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.5.0-1
+- 5.5.0
+
+* Fri Feb 16 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.4.4-1
+- 5.4.4
+
+* Wed Feb 14 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.4.3-1
+- 5.4.3
+
+* Tue Feb 13 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.4.2-1
+- 5.4.2
+
+* Tue Feb 06 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.4.1-1
+- 5.4.1
+
+* Mon Feb 05 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.4.0-1
+- 5.4.0
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sun Jan 21 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 5.3.0-3
 - Backport upstream patch to fix test with ImageMagick 7.1.1-26
 

sources

@@ -1,2 +1,2 @@
-SHA512 (rmagick-5.3.0.gem) = b53475dd2520188079f1710d0d85b31e32d9d7bc144ce4e2e547aa899763787dc9582319f2bc42f7c908dbce2eb76c8e86b8a2a4c9cd4648d605d5d860a2b922
-SHA512 (rubygem-rmagick-5.3.0-full.tar.gz) = 401a96f2feadb68a54e037bcc0afdaf4b44e953d9958596213b0d143eeae247c5276804ecdcff3b605b0d47398414d3d7e61c485a870b99e493601238ef1eb77
+SHA512 (rmagick-6.1.5.gem) = 15157dda3185e8677c08d9b33564d1c85e3c3573ad9f6ab2358c32ec8a790eb2aa765cde095f98eb500cd818e3b71535dd289524eb35c9c5e721be3af4b1ba18
+SHA512 (rubygem-rmagick-6.1.5-full.tar.gz) = ce65bacd8e775fc4751784d427ab52a5b936ca5a465751d63380d42e0928911389f3388474c936eeb59d93d242c9923240168911705c1243b8e5d195d258fd8a