From 5d7334218beee3c1f4c90b93406167e2210a8ee2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 21 Jan 2024 22:58:11 +0900 Subject: [PATCH 01/26] prep for branching --- rubygem-rmagick.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 3155118..3499829 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -34,11 +34,10 @@ BuildRequires: rubygem(pry) # Due to test/RMagick/rmmain.c test_Magick_version(), for now # we specify the exact version for ImageMagick %if 0%{?fedora} +%setIMver 41 1:7.1.1 1:7.1.2 %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 %endif Obsoletes: ruby-RMagick < 2.13.2 From 429b211f53ed1d0b4429a6f3f5dbe1fef1d8db6b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 17:25:07 +0000 Subject: [PATCH 02/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rubygem-rmagick.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 3499829..7cebc36 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -9,7 +9,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ Name: rubygem-%{gem_name} Version: 5.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Ruby binding to ImageMagick # SPDX confirmed @@ -154,6 +154,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 5.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Mamoru TASAKA - 5.3.0-3 - Backport upstream patch to fix test with ImageMagick 7.1.1-26 From 463d04909e7b3f222f1958ad5eb18c73cea64fd8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 5 Feb 2024 11:32:03 +0900 Subject: [PATCH 03/26] 5.4.0 --- ...ick-pr1434-fix-test-with-IM-6_9_13_4.patch | 26 ------------------- ...ick-pr1435-fix-test-with-IM-7_1_1_26.patch | 23 ---------------- rubygem-rmagick.spec | 17 ++++++------ sources | 4 +-- 4 files changed, 10 insertions(+), 60 deletions(-) delete mode 100644 rmagick-pr1434-fix-test-with-IM-6_9_13_4.patch delete mode 100644 rmagick-pr1435-fix-test-with-IM-7_1_1_26.patch diff --git a/rmagick-pr1434-fix-test-with-IM-6_9_13_4.patch b/rmagick-pr1434-fix-test-with-IM-6_9_13_4.patch deleted file mode 100644 index a0834b0..0000000 --- a/rmagick-pr1434-fix-test-with-IM-6_9_13_4.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3430911fdecb467511f96ae9858bc89c8cd3c24a Mon Sep 17 00:00:00 2001 -From: Watson -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) diff --git a/rmagick-pr1435-fix-test-with-IM-7_1_1_26.patch b/rmagick-pr1435-fix-test-with-IM-7_1_1_26.patch deleted file mode 100644 index 2f6dff6..0000000 --- a/rmagick-pr1435-fix-test-with-IM-7_1_1_26.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 023c6de618236b921e488214b43dc263bf39b659 Mon Sep 17 00:00:00 2001 -From: Watson -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) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 7cebc36..9ffd463 100644 --- a/rubygem-rmagick.spec +++ b/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: 4%{?dist} +Version: 5.4.0 +Release: 1%{?dist} Summary: Ruby binding to ImageMagick # SPDX confirmed @@ -19,10 +19,6 @@ 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: rubygems-devel @@ -63,9 +59,6 @@ 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 @@ -77,6 +70,9 @@ sed -i ext/RMagick/extconf.rb \ sed -i ext/RMagick/extconf.rb \ -e "\@-std=gnu99@s|-Wno[^ \t'][^ \t']*||g" +# observer is in standard lib, kill dependency for now +sed -i '\@runtime.*observer@d' %{gem_name}.gemspec + %build export MAKE="make %{?_smp_mflags}" # Make sure that .so is to be created newly @@ -154,6 +150,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Mon Feb 05 2024 Mamoru TASAKA - 5.4.0-1 +- 5.4.0 + * Fri Jan 26 2024 Fedora Release Engineering - 5.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index c589990..8353dfa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rmagick-5.3.0.gem) = b53475dd2520188079f1710d0d85b31e32d9d7bc144ce4e2e547aa899763787dc9582319f2bc42f7c908dbce2eb76c8e86b8a2a4c9cd4648d605d5d860a2b922 -SHA512 (rubygem-rmagick-5.3.0-full.tar.gz) = 401a96f2feadb68a54e037bcc0afdaf4b44e953d9958596213b0d143eeae247c5276804ecdcff3b605b0d47398414d3d7e61c485a870b99e493601238ef1eb77 +SHA512 (rmagick-5.4.0.gem) = e60c0f488e429ac0b66f4ad990fba906b13e6cd734c347eb357c6a8101d5302534d0df04dfa93363dc91eda2ccb846490963587196241872d434f3bacc55c412 +SHA512 (rubygem-rmagick-5.4.0-full.tar.gz) = 7e42808261433d83c6fd55fd97bece91e37cb9d1a3812c386c54ff0bfd9154a7b5086498b343b04ba7e07b7b4bcfadb678e78d3f6e4cc459f2aa60022376bed4 From 7fea540f21b069374735ddfa6319deddde2f1eea Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 5 Feb 2024 11:36:27 +0900 Subject: [PATCH 04/26] Now using c++ --- rubygem-rmagick.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 9ffd463..2b722bc 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -20,7 +20,7 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem Source1: rubygem-%{gem_name}-%{version}-full.tar.gz Source2: rmagick-create-full-tarball.sh -BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: rubygems-devel BuildRequires: ruby-devel BuildRequires: rubygem(pkg-config) From fed4e5b1c778c6fcd5adec329f47c7d97636b76d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 5 Feb 2024 13:20:36 +0900 Subject: [PATCH 05/26] fix invalid cast on big endian --- rubygem-rmagick.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 2b722bc..9e8eb57 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -73,6 +73,14 @@ sed -i ext/RMagick/extconf.rb \ # observer is in standard lib, kill dependency for now sed -i '\@runtime.*observer@d' %{gem_name}.gemspec +# https://github.com/rmagick/rmagick/issues/1447 +# Fix invalid cast on s390x (big endian) +sed -i.orig \ + ext/RMagick/rmimage.cpp \ + ext/RMagick/rmdraw.cpp \ + -e 's|\(reinterpret_cast(reinterpret_cast Date: Tue, 6 Feb 2024 11:20:51 +0900 Subject: [PATCH 06/26] 5.4.1 --- rubygem-rmagick.spec | 13 ++++--------- sources | 4 ++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 9e8eb57..5b9fada 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -8,7 +8,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ %{nil} Name: rubygem-%{gem_name} -Version: 5.4.0 +Version: 5.4.1 Release: 1%{?dist} Summary: Ruby binding to ImageMagick @@ -73,14 +73,6 @@ sed -i ext/RMagick/extconf.rb \ # observer is in standard lib, kill dependency for now sed -i '\@runtime.*observer@d' %{gem_name}.gemspec -# https://github.com/rmagick/rmagick/issues/1447 -# Fix invalid cast on s390x (big endian) -sed -i.orig \ - ext/RMagick/rmimage.cpp \ - ext/RMagick/rmdraw.cpp \ - -e 's|\(reinterpret_cast(reinterpret_cast - 5.4.1-1 +- 5.4.1 + * Mon Feb 05 2024 Mamoru TASAKA - 5.4.0-1 - 5.4.0 diff --git a/sources b/sources index 8353dfa..5071bf6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rmagick-5.4.0.gem) = e60c0f488e429ac0b66f4ad990fba906b13e6cd734c347eb357c6a8101d5302534d0df04dfa93363dc91eda2ccb846490963587196241872d434f3bacc55c412 -SHA512 (rubygem-rmagick-5.4.0-full.tar.gz) = 7e42808261433d83c6fd55fd97bece91e37cb9d1a3812c386c54ff0bfd9154a7b5086498b343b04ba7e07b7b4bcfadb678e78d3f6e4cc459f2aa60022376bed4 +SHA512 (rmagick-5.4.1.gem) = 34ea2db6f378328887d0ef64002e7cf15b5c2f075ec34e840595372069837ea25174b3f4cb93ce1c923f5d50daacf914fe6ca38782f0cef8f9c48d9285681dc1 +SHA512 (rubygem-rmagick-5.4.1-full.tar.gz) = 5324874ea7ace1814df41740d0be5a8fcc4c8d92db3e6aefd7e7318d7384d680d24e9c6d921c88632a043572d105d48fd4477d7733611e0a2aa33d150ce9c4bb From d2e873322fc13b43528192dcedbc4ced3395dfa2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 13 Feb 2024 15:37:22 +0900 Subject: [PATCH 07/26] 5.4.2 --- rubygem-rmagick.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 5b9fada..254cff4 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -8,7 +8,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ %{nil} Name: rubygem-%{gem_name} -Version: 5.4.1 +Version: 5.4.2 Release: 1%{?dist} Summary: Ruby binding to ImageMagick @@ -150,6 +150,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Tue Feb 13 2024 Mamoru TASAKA - 5.4.2-1 +- 5.4.2 + * Tue Feb 06 2024 Mamoru TASAKA - 5.4.1-1 - 5.4.1 diff --git a/sources b/sources index 5071bf6..00072eb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rmagick-5.4.1.gem) = 34ea2db6f378328887d0ef64002e7cf15b5c2f075ec34e840595372069837ea25174b3f4cb93ce1c923f5d50daacf914fe6ca38782f0cef8f9c48d9285681dc1 -SHA512 (rubygem-rmagick-5.4.1-full.tar.gz) = 5324874ea7ace1814df41740d0be5a8fcc4c8d92db3e6aefd7e7318d7384d680d24e9c6d921c88632a043572d105d48fd4477d7733611e0a2aa33d150ce9c4bb +SHA512 (rmagick-5.4.2.gem) = 3e987ef40e15ab8e0ec951c6fe9a6a3f4694d6ad87821224a4feb42a589de9197b88e78e1cd929eb587ac5702215425b76fbcbc3a84973c574c93747eb14a9e4 +SHA512 (rubygem-rmagick-5.4.2-full.tar.gz) = 4f1bf64158802761c86007ef9286836fda4ed782462d60a19687fb21e6072b1eddb082f54f2c0da1a9d4a16a4b51247d96c8ee9fe7d37cf38342850c88221bb1 From 475582dd8edd9daf249b28682783e4b5d7d30dc7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 14 Feb 2024 21:34:33 +0900 Subject: [PATCH 08/26] 5.4.3 --- rubygem-rmagick.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 254cff4..87218a8 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -8,7 +8,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ %{nil} Name: rubygem-%{gem_name} -Version: 5.4.2 +Version: 5.4.3 Release: 1%{?dist} Summary: Ruby binding to ImageMagick @@ -150,6 +150,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Wed Feb 14 2024 Mamoru TASAKA - 5.4.3-1 +- 5.4.3 + * Tue Feb 13 2024 Mamoru TASAKA - 5.4.2-1 - 5.4.2 diff --git a/sources b/sources index 00072eb..b10de23 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rmagick-5.4.2.gem) = 3e987ef40e15ab8e0ec951c6fe9a6a3f4694d6ad87821224a4feb42a589de9197b88e78e1cd929eb587ac5702215425b76fbcbc3a84973c574c93747eb14a9e4 -SHA512 (rubygem-rmagick-5.4.2-full.tar.gz) = 4f1bf64158802761c86007ef9286836fda4ed782462d60a19687fb21e6072b1eddb082f54f2c0da1a9d4a16a4b51247d96c8ee9fe7d37cf38342850c88221bb1 +SHA512 (rmagick-5.4.3.gem) = baef624d98dd74183259ff64d13e5a1fddd92996078f6ae7c91ee401eb0565ae9f1f53745fa52d0afcc01dcd160fb8f35fa572b00bb13151f94b8dd26cff6c79 +SHA512 (rubygem-rmagick-5.4.3-full.tar.gz) = fd6c887d62279b2df69d31a15f805d3216b5c0714f7fc63377eef295caa3f4a91c6f20e20cf1ce1bb67fd3f86ffbbf7498bd66c83edd29fbf87e011fee0859c3 From 327c8e52dd0bb022442e408706e5da502b075da8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 16 Feb 2024 11:13:16 +0900 Subject: [PATCH 09/26] 5.4.4 --- rubygem-rmagick.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 87218a8..d8bb780 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -8,7 +8,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ %{nil} Name: rubygem-%{gem_name} -Version: 5.4.3 +Version: 5.4.4 Release: 1%{?dist} Summary: Ruby binding to ImageMagick @@ -150,6 +150,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Fri Feb 16 2024 Mamoru TASAKA - 5.4.4-1 +- 5.4.4 + * Wed Feb 14 2024 Mamoru TASAKA - 5.4.3-1 - 5.4.3 diff --git a/sources b/sources index b10de23..54854d2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rmagick-5.4.3.gem) = baef624d98dd74183259ff64d13e5a1fddd92996078f6ae7c91ee401eb0565ae9f1f53745fa52d0afcc01dcd160fb8f35fa572b00bb13151f94b8dd26cff6c79 -SHA512 (rubygem-rmagick-5.4.3-full.tar.gz) = fd6c887d62279b2df69d31a15f805d3216b5c0714f7fc63377eef295caa3f4a91c6f20e20cf1ce1bb67fd3f86ffbbf7498bd66c83edd29fbf87e011fee0859c3 +SHA512 (rmagick-5.4.4.gem) = 064e63bb8afba6d86abb909a171951a2c3dd1d77246728b890d0bcedc614426d0d07d86c8198fd036b84a776dd09e55a0a3c4369b8997d54e65b292aaa6ea7bc +SHA512 (rubygem-rmagick-5.4.4-full.tar.gz) = fb603f47da09cfd5d70ed5bd7eeca3661930a761a6604391e57f36a8446794bf976f414d56f7e228b721938c253f3ecf848fd4e3b657275fcab648cef91e3379 From 29a17d158f4b56d9f865efc765969f66e8a25eac Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 8 Apr 2024 17:15:40 +0900 Subject: [PATCH 10/26] 5.5.0 --- rubygem-rmagick.spec | 7 ++++++- sources | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index d8bb780..b933f44 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -8,7 +8,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ %{nil} Name: rubygem-%{gem_name} -Version: 5.4.4 +Version: 5.5.0 Release: 1%{?dist} Summary: Ruby binding to ImageMagick @@ -30,6 +30,7 @@ BuildRequires: rubygem(pry) # Due to test/RMagick/rmmain.c test_Magick_version(), for now # we specify the exact version for ImageMagick %if 0%{?fedora} +%setIMver 42 1:7.1.1 1:7.1.2 %setIMver 41 1:7.1.1 1:7.1.2 %setIMver 40 1:7.1.1 1:7.1.2 %setIMver 39 1:7.1.1 1:7.1.2 @@ -140,6 +141,7 @@ done %{gem_libdir}/ %{gem_extdir_mri}/ +%{gem_instdir}/sig/ %exclude %{gem_cache} %{gem_spec} @@ -150,6 +152,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Mon Apr 08 2024 Mamoru TASAKA - 5.5.0-1 +- 5.5.0 + * Fri Feb 16 2024 Mamoru TASAKA - 5.4.4-1 - 5.4.4 diff --git a/sources b/sources index 54854d2..a3b6eb1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rmagick-5.4.4.gem) = 064e63bb8afba6d86abb909a171951a2c3dd1d77246728b890d0bcedc614426d0d07d86c8198fd036b84a776dd09e55a0a3c4369b8997d54e65b292aaa6ea7bc -SHA512 (rubygem-rmagick-5.4.4-full.tar.gz) = fb603f47da09cfd5d70ed5bd7eeca3661930a761a6604391e57f36a8446794bf976f414d56f7e228b721938c253f3ecf848fd4e3b657275fcab648cef91e3379 +SHA512 (rmagick-5.5.0.gem) = 42ff50670eb24d8fea9a0526791f7dfd78629df725874d5ba313f7d408c7d786756d9b85ad469bacc228b6c03843b4fec3d73381fc8acb9a0c720ebcb3eb7d3d +SHA512 (rubygem-rmagick-5.5.0-full.tar.gz) = 1e56cf78fe6f46633cec24f4fff507915b3142965e676caa5764d6e3d87fadb89562eb2b4155059444c31452715eacf8dce4d821d81d79e003e91227115e9e52 From 87d444ed9a973b9eff0e266013584818cb230a6c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 3 May 2024 14:02:36 +0900 Subject: [PATCH 11/26] 6.0.0 --- rubygem-rmagick.spec | 12 +++++++++--- sources | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index b933f44..d1a4297 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -8,7 +8,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ %{nil} Name: rubygem-%{gem_name} -Version: 5.5.0 +Version: 6.0.0 Release: 1%{?dist} Summary: Ruby binding to ImageMagick @@ -29,9 +29,12 @@ BuildRequires: rubygem(rspec) BuildRequires: rubygem(pry) # Due to test/RMagick/rmmain.c 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 42 1:7.1.1 1:7.1.2 -%setIMver 41 1:7.1.1 1:7.1.2 +%setIMver 42 1:7.1 1:7.2 +%setIMver 41 1:7.1 1:7.2 %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 @@ -152,6 +155,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Fri May 03 2024 Mamoru TASAKA - 6.0.0-1 +- 6.0.0 + * Mon Apr 08 2024 Mamoru TASAKA - 5.5.0-1 - 5.5.0 diff --git a/sources b/sources index a3b6eb1..86f9699 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rmagick-5.5.0.gem) = 42ff50670eb24d8fea9a0526791f7dfd78629df725874d5ba313f7d408c7d786756d9b85ad469bacc228b6c03843b4fec3d73381fc8acb9a0c720ebcb3eb7d3d -SHA512 (rubygem-rmagick-5.5.0-full.tar.gz) = 1e56cf78fe6f46633cec24f4fff507915b3142965e676caa5764d6e3d87fadb89562eb2b4155059444c31452715eacf8dce4d821d81d79e003e91227115e9e52 +SHA512 (rmagick-6.0.0.gem) = 08e3f3116c81cc164393e151d1030178024fd557e05004dd0bea5fedfc332d239ca2a0982bf378c1c218f3646787810aa350ea04c1568909ad13af887d23f98c +SHA512 (rubygem-rmagick-6.0.0-full.tar.gz) = 3bee2c94c43fe1c2b81675a8fd6d4bc87ddfe9ad561b06d98e37b79f2c4e485dff3957a5a5c9743c2aa03a22b3183cad9192e60776502999402c0357c6a04aba From d80c52fa34bd2f275c1c87568bf9f7db91407bba Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 16 May 2024 16:53:11 +0900 Subject: [PATCH 12/26] 6.0.1 --- rmagick-create-full-tarball.sh | 11 +++++++++++ rubygem-rmagick.spec | 5 ++++- sources | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/rmagick-create-full-tarball.sh b/rmagick-create-full-tarball.sh index 50b8afd..4a60f3a 100644 --- a/rmagick-create-full-tarball.sh +++ b/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} diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index d1a4297..83767fc 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -8,7 +8,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ %{nil} Name: rubygem-%{gem_name} -Version: 6.0.0 +Version: 6.0.1 Release: 1%{?dist} Summary: Ruby binding to ImageMagick @@ -155,6 +155,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Thu May 16 2024 Mamoru TASAKA - 6.0.1-1 +- 6.0.1 + * Fri May 03 2024 Mamoru TASAKA - 6.0.0-1 - 6.0.0 diff --git a/sources b/sources index 86f9699..d5f601c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rmagick-6.0.0.gem) = 08e3f3116c81cc164393e151d1030178024fd557e05004dd0bea5fedfc332d239ca2a0982bf378c1c218f3646787810aa350ea04c1568909ad13af887d23f98c -SHA512 (rubygem-rmagick-6.0.0-full.tar.gz) = 3bee2c94c43fe1c2b81675a8fd6d4bc87ddfe9ad561b06d98e37b79f2c4e485dff3957a5a5c9743c2aa03a22b3183cad9192e60776502999402c0357c6a04aba +SHA512 (rmagick-6.0.1.gem) = 56237181fe89a2070da6a410e98c1af10a1e656ca3797152153a92f052bf03f5570edd9076fe368cd025f2ed7a42ea0f4b5789aeeb401a23ff8f97e047cd9d62 +SHA512 (rubygem-rmagick-6.0.1-full.tar.gz) = 5ffc50373f6f118474201c02c55add66f338ef2002fa8dca9892906e4908e88956b2755595b38bf56c37a614f20928c34a9d2b5902ff21dbe79fe5c4b4247e6f From 61f54a2cc939975b386f7f52851a83d0ce0350b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 19:53:36 +0000 Subject: [PATCH 13/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- rubygem-rmagick.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 83767fc..7574223 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -9,7 +9,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ Name: rubygem-%{gem_name} Version: 6.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ruby binding to ImageMagick # SPDX confirmed @@ -155,6 +155,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 6.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu May 16 2024 Mamoru TASAKA - 6.0.1-1 - 6.0.1 From a8c6e5630347a6e2e18dd4faa455c4c8062d6bcc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 2 Nov 2024 21:40:09 +0900 Subject: [PATCH 14/26] Add BR: rubygem(observer) explicitly --- rubygem-rmagick.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 7574223..98baaa5 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -9,7 +9,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ Name: rubygem-%{gem_name} Version: 6.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Ruby binding to ImageMagick # SPDX confirmed @@ -24,6 +24,7 @@ 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) @@ -155,6 +156,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Sat Nov 02 2024 Mamoru TASAKA - 6.0.1-3 +- Add BR: rubygem(observer) explicitly + * Fri Jul 19 2024 Fedora Release Engineering - 6.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d61b0f5afe77b0275c3d9b48bd396c2f14ff2aa4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 8 Jan 2025 08:45:49 +0900 Subject: [PATCH 15/26] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 --- rubygem-rmagick.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 98baaa5..6e7bc31 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -9,7 +9,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ Name: rubygem-%{gem_name} Version: 6.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Ruby binding to ImageMagick # SPDX confirmed @@ -156,6 +156,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Tue Jan 07 2025 Mamoru TASAKA - 6.0.1-4 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 + * Sat Nov 02 2024 Mamoru TASAKA - 6.0.1-3 - Add BR: rubygem(observer) explicitly From 4a1eee0b774eacecd51c128e345222a6371888fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 23:56:14 +0000 Subject: [PATCH 16/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rubygem-rmagick.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 6e7bc31..023eceb 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -9,7 +9,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ Name: rubygem-%{gem_name} Version: 6.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Ruby binding to ImageMagick # SPDX confirmed @@ -156,6 +156,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 6.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Jan 07 2025 Mamoru TASAKA - 6.0.1-4 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 From bc6a68b503d9adfc551c2143bd79ca08d8442f9e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 19 Jan 2025 17:33:25 +0900 Subject: [PATCH 17/26] 6.1.0 --- rubygem-rmagick.spec | 24 +++++++----------------- sources | 4 ++-- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 6e7bc31..a8281b1 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -8,8 +8,8 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ %{nil} Name: rubygem-%{gem_name} -Version: 6.0.1 -Release: 4%{?dist} +Version: 6.1.0 +Release: 1%{?dist} Summary: Ruby binding to ImageMagick # SPDX confirmed @@ -28,17 +28,15 @@ 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 43 1:7.1 1:7.2 %setIMver 42 1:7.1 1:7.2 %setIMver 41 1:7.1 1:7.2 -%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 %endif Obsoletes: ruby-RMagick < 2.13.2 @@ -67,17 +65,6 @@ gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec # 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" - -# observer is in standard lib, kill dependency for now -sed -i '\@runtime.*observer@d' %{gem_name}.gemspec - %build export MAKE="make %{?_smp_mflags}" # Make sure that .so is to be created newly @@ -156,6 +143,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Sun Jan 19 2025 Mamoru TASAKA - 6.1.0-1 +- 6.1.0 + * Tue Jan 07 2025 Mamoru TASAKA - 6.0.1-4 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 diff --git a/sources b/sources index d5f601c..7ed2c3b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rmagick-6.0.1.gem) = 56237181fe89a2070da6a410e98c1af10a1e656ca3797152153a92f052bf03f5570edd9076fe368cd025f2ed7a42ea0f4b5789aeeb401a23ff8f97e047cd9d62 -SHA512 (rubygem-rmagick-6.0.1-full.tar.gz) = 5ffc50373f6f118474201c02c55add66f338ef2002fa8dca9892906e4908e88956b2755595b38bf56c37a614f20928c34a9d2b5902ff21dbe79fe5c4b4247e6f +SHA512 (rmagick-6.1.0.gem) = 29e2f66d9a3a570a81e965f7a00c985ccb1a3a9fd912306aba5491d11316cb7080bf84345bfed0fabc144ad894b0a26d32da8b31d5a8355a7fd06b63afa0f731 +SHA512 (rubygem-rmagick-6.1.0-full.tar.gz) = 811a8c9e08f38fe5c2b1784317af1f94c820ddd25d3e6581c6d44042787ad40b489c5f9978003cce4f84e45b57ec365c253951c7a3e9848b40adb4a21c342bda From 700bcb953c751b4bdfa69b34461e580601268ac3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 2 Feb 2025 14:11:16 +0900 Subject: [PATCH 18/26] 6.1.1 --- rubygem-rmagick.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index f5b8523..5610cdd 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -8,7 +8,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ %{nil} Name: rubygem-%{gem_name} -Version: 6.1.0 +Version: 6.1.1 Release: 1%{?dist} Summary: Ruby binding to ImageMagick @@ -143,6 +143,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Sun Feb 02 2025 Mamoru TASAKA - 6.1.1-1 +- 6.1.1 + * Sun Jan 19 2025 Mamoru TASAKA - 6.1.0-1 - 6.1.0 diff --git a/sources b/sources index 7ed2c3b..a486468 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rmagick-6.1.0.gem) = 29e2f66d9a3a570a81e965f7a00c985ccb1a3a9fd912306aba5491d11316cb7080bf84345bfed0fabc144ad894b0a26d32da8b31d5a8355a7fd06b63afa0f731 -SHA512 (rubygem-rmagick-6.1.0-full.tar.gz) = 811a8c9e08f38fe5c2b1784317af1f94c820ddd25d3e6581c6d44042787ad40b489c5f9978003cce4f84e45b57ec365c253951c7a3e9848b40adb4a21c342bda +SHA512 (rmagick-6.1.1.gem) = 7e34ec10b50ed59083b65b793ab6d3f7c2bd1c1b3cc1ee7f5d781cf8f9dd780de325814f5d249de6e44f1631ec2f8c61d2b18e75501546b5afa5d980bab0a595 +SHA512 (rubygem-rmagick-6.1.1-full.tar.gz) = ad9b24e083b19735951b09430d8086867258dc16b081c1b200ccbc4e3831420cfa1100543d0f7275268b3564e06253d61e1560d1bae249caef66ee22f223b4de From bb58037a4e4f4ed108a5e39721b13a065f77f9e3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 20 Jul 2025 17:19:30 +0900 Subject: [PATCH 19/26] 6.1.2 --- rubygem-rmagick.spec | 6 +++++- sources | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 5610cdd..987ede0 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -8,7 +8,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ %{nil} Name: rubygem-%{gem_name} -Version: 6.1.1 +Version: 6.1.2 Release: 1%{?dist} Summary: Ruby binding to ImageMagick @@ -34,6 +34,7 @@ BuildRequires: rubygem(pry) # 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 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 @@ -143,6 +144,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Sun Jul 20 2025 Mamoru TASAKA - 6.1.2-1 +- 6.1.2 + * Sun Feb 02 2025 Mamoru TASAKA - 6.1.1-1 - 6.1.1 diff --git a/sources b/sources index a486468..f8d9c03 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rmagick-6.1.1.gem) = 7e34ec10b50ed59083b65b793ab6d3f7c2bd1c1b3cc1ee7f5d781cf8f9dd780de325814f5d249de6e44f1631ec2f8c61d2b18e75501546b5afa5d980bab0a595 -SHA512 (rubygem-rmagick-6.1.1-full.tar.gz) = ad9b24e083b19735951b09430d8086867258dc16b081c1b200ccbc4e3831420cfa1100543d0f7275268b3564e06253d61e1560d1bae249caef66ee22f223b4de +SHA512 (rmagick-6.1.2.gem) = afae91302878630f2ed3c4abb0ae77658a646a054e7ac579795ee6094d0e30b98951731ee976ffc25bfddacbfb4c3b485a88cc3718e8962e1edaed75ceff0e4a +SHA512 (rubygem-rmagick-6.1.2-full.tar.gz) = 7f4de3e12a227b7716b42695b1dfe8e6c690359af1280d9deb3476d82639b6c5b1181998f878bd4f90375440fb219b15ef3517cd1f7de13bddbdc8d641835a0c From 77dee1c21cc3a45e3e454a84334072459e9e09c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:44:57 +0000 Subject: [PATCH 20/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-rmagick.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 987ede0..1dfd12d 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -9,7 +9,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ Name: rubygem-%{gem_name} Version: 6.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ruby binding to ImageMagick # SPDX confirmed @@ -144,6 +144,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 6.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jul 20 2025 Mamoru TASAKA - 6.1.2-1 - 6.1.2 From a204247da42929837dc10b08e396087f62f39a34 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 17 Aug 2025 10:44:21 +0900 Subject: [PATCH 21/26] 6.1.3 --- rubygem-rmagick.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 1dfd12d..51d55ac 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -8,8 +8,8 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ %{nil} Name: rubygem-%{gem_name} -Version: 6.1.2 -Release: 2%{?dist} +Version: 6.1.3 +Release: 1%{?dist} Summary: Ruby binding to ImageMagick # SPDX confirmed @@ -34,6 +34,7 @@ BuildRequires: rubygem(pry) # 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 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 @@ -144,6 +145,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Sun Aug 17 2025 Mamoru TASAKA - 6.1.3-1 +- 6.1.3 + * Fri Jul 25 2025 Fedora Release Engineering - 6.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a5e1e0ff2ef15c8c9e64e59180b118b57c0ca41b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 17 Aug 2025 12:13:00 +0900 Subject: [PATCH 22/26] upload source --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index f8d9c03..ba2a0fd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rmagick-6.1.2.gem) = afae91302878630f2ed3c4abb0ae77658a646a054e7ac579795ee6094d0e30b98951731ee976ffc25bfddacbfb4c3b485a88cc3718e8962e1edaed75ceff0e4a -SHA512 (rubygem-rmagick-6.1.2-full.tar.gz) = 7f4de3e12a227b7716b42695b1dfe8e6c690359af1280d9deb3476d82639b6c5b1181998f878bd4f90375440fb219b15ef3517cd1f7de13bddbdc8d641835a0c +SHA512 (rmagick-6.1.3.gem) = 39e2341092428dcae7eab7243bb7f2584d3f5f1e7ad944ed809bd32bbc2954e0eb04eff11a6ee1c7607017821833bc9803ab815caba333e2934a6cab4be30126 +SHA512 (rubygem-rmagick-6.1.3-full.tar.gz) = 95a2a6c308bd964df2cf27970f7184a9556803fa4eb8c6e1a41930ac678be2726c39fe97d7ec33d62abe520de6ae16b49a29caaa2f141ab8836ead44e5205285 From 9415692ce841dcc2cf3d720ce8133844321dd867 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 24 Aug 2025 22:31:06 +0900 Subject: [PATCH 23/26] 6.1.4 --- rubygem-rmagick.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 51d55ac..66a73d6 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -8,7 +8,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ %{nil} Name: rubygem-%{gem_name} -Version: 6.1.3 +Version: 6.1.4 Release: 1%{?dist} Summary: Ruby binding to ImageMagick @@ -145,6 +145,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Sun Aug 24 2025 Mamoru TASAKA - 6.1.4-1 +- 6.1.4 + * Sun Aug 17 2025 Mamoru TASAKA - 6.1.3-1 - 6.1.3 diff --git a/sources b/sources index ba2a0fd..72f4739 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rmagick-6.1.3.gem) = 39e2341092428dcae7eab7243bb7f2584d3f5f1e7ad944ed809bd32bbc2954e0eb04eff11a6ee1c7607017821833bc9803ab815caba333e2934a6cab4be30126 -SHA512 (rubygem-rmagick-6.1.3-full.tar.gz) = 95a2a6c308bd964df2cf27970f7184a9556803fa4eb8c6e1a41930ac678be2726c39fe97d7ec33d62abe520de6ae16b49a29caaa2f141ab8836ead44e5205285 +SHA512 (rmagick-6.1.4.gem) = 85fbe577a82f16e46394551ea0a94aa49afea53f955ce0c8889cf4527e658ab7e5fd646b1994d63c983a75281c4b2de8c12f89c5573f76732ac947fd6894b842 +SHA512 (rubygem-rmagick-6.1.4-full.tar.gz) = dc831d7459af0888eefba8fb172be0f910a7ce8f41709153923036f190de2d63d96368cc13a14f571c9b17383852d48929d21ff0a7c84689bf867ac7c22a6dbc From d2310562f5556c2e25f0df3bb8e082cb8e25d6b2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 29 Oct 2025 23:32:40 +0900 Subject: [PATCH 24/26] Apply upstream patch for ruby3_5 Ractor change for testsuite --- rmagick-pr1712-Ractor_take_removal.patch | 61 ++++++++++++++++++++++++ rubygem-rmagick.spec | 9 +++- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 rmagick-pr1712-Ractor_take_removal.patch diff --git a/rmagick-pr1712-Ractor_take_removal.patch b/rmagick-pr1712-Ractor_take_removal.patch new file mode 100644 index 0000000..54fea94 --- /dev/null +++ b/rmagick-pr1712-Ractor_take_removal.patch @@ -0,0 +1,61 @@ +From 4f072008e8fe3cb97d6d537dd7d0a44b9a1b5be1 Mon Sep 17 00:00:00 2001 +From: Shizuo Fujita +Date: Wed, 15 Oct 2025 10:58:26 +0900 +Subject: [PATCH] CI: Support Ruby 3.5 + +--- + spec/magick_spec.rb | 27 ++++++++++++++++++++++++--- + 1 file changed, 24 insertions(+), 3 deletions(-) + +diff --git a/spec/magick_spec.rb b/spec/magick_spec.rb +index 1d5425032..13d78ba6e 100644 +--- a/spec/magick_spec.rb ++++ b/spec/magick_spec.rb +@@ -76,7 +76,14 @@ + img.new_image(200, 200, Magick::GradientFill.new(100, 50, 100, 50, 'khaki1', 'turquoise')) + img.resize(20, 20) + end +- r.take ++ ++ if r.respond_to?(:take) ++ r.take ++ else ++ # Ractor#take was replaced at Ruby 3.5. ++ # https://bugs.ruby-lang.org/issues/21262 ++ r.join ++ end + end.not_to raise_error + + expect do +@@ -90,7 +97,14 @@ + gc.text(5, 20, "'20,20'") + gc.draw(img) + end +- r.take ++ ++ if r.respond_to?(:take) ++ r.take ++ else ++ # Ractor#take was replaced at Ruby 3.5. ++ # https://bugs.ruby-lang.org/issues/21262 ++ r.join ++ end + end.not_to raise_error + + unless RUBY_PLATFORM.include?('mingw') +@@ -99,7 +113,14 @@ + r = Ractor.new do + Magick.formats # rubocop:disable RSpec/DescribedClass + end +- r.take ++ ++ if r.respond_to?(:take) ++ r.take ++ else ++ # Ractor#take was replaced at Ruby 3.5. ++ # https://bugs.ruby-lang.org/issues/21262 ++ r.join ++ end + end.not_to raise_error + end + end diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 66a73d6..fc91392 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -9,7 +9,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ Name: rubygem-%{gem_name} Version: 6.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ruby binding to ImageMagick # SPDX confirmed @@ -19,6 +19,9 @@ 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/1712 +# Ractor#take is removed on ruby3_5 +Patch0: rmagick-pr1712-Ractor_take_removal.patch BuildRequires: gcc-c++ BuildRequires: rubygems-devel @@ -62,6 +65,7 @@ Documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 +%patch -P0 -p1 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec # permission @@ -145,6 +149,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Wed Oct 29 2025 Mamoru TASAKA - 6.1.4-2 +- Apply upstream patch for ruby3_5 Ractor change for testsuite + * Sun Aug 24 2025 Mamoru TASAKA - 6.1.4-1 - 6.1.4 From 55877aed4830c9b9d2c31ec0110033e796fd9df9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 28 Dec 2025 21:38:23 +0900 Subject: [PATCH 25/26] 6.1.5 --- rmagick-pr1712-Ractor_take_removal.patch | 61 ------------------------ rubygem-rmagick.spec | 11 ++--- sources | 4 +- 3 files changed, 7 insertions(+), 69 deletions(-) delete mode 100644 rmagick-pr1712-Ractor_take_removal.patch diff --git a/rmagick-pr1712-Ractor_take_removal.patch b/rmagick-pr1712-Ractor_take_removal.patch deleted file mode 100644 index 54fea94..0000000 --- a/rmagick-pr1712-Ractor_take_removal.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 4f072008e8fe3cb97d6d537dd7d0a44b9a1b5be1 Mon Sep 17 00:00:00 2001 -From: Shizuo Fujita -Date: Wed, 15 Oct 2025 10:58:26 +0900 -Subject: [PATCH] CI: Support Ruby 3.5 - ---- - spec/magick_spec.rb | 27 ++++++++++++++++++++++++--- - 1 file changed, 24 insertions(+), 3 deletions(-) - -diff --git a/spec/magick_spec.rb b/spec/magick_spec.rb -index 1d5425032..13d78ba6e 100644 ---- a/spec/magick_spec.rb -+++ b/spec/magick_spec.rb -@@ -76,7 +76,14 @@ - img.new_image(200, 200, Magick::GradientFill.new(100, 50, 100, 50, 'khaki1', 'turquoise')) - img.resize(20, 20) - end -- r.take -+ -+ if r.respond_to?(:take) -+ r.take -+ else -+ # Ractor#take was replaced at Ruby 3.5. -+ # https://bugs.ruby-lang.org/issues/21262 -+ r.join -+ end - end.not_to raise_error - - expect do -@@ -90,7 +97,14 @@ - gc.text(5, 20, "'20,20'") - gc.draw(img) - end -- r.take -+ -+ if r.respond_to?(:take) -+ r.take -+ else -+ # Ractor#take was replaced at Ruby 3.5. -+ # https://bugs.ruby-lang.org/issues/21262 -+ r.join -+ end - end.not_to raise_error - - unless RUBY_PLATFORM.include?('mingw') -@@ -99,7 +113,14 @@ - r = Ractor.new do - Magick.formats # rubocop:disable RSpec/DescribedClass - end -- r.take -+ -+ if r.respond_to?(:take) -+ r.take -+ else -+ # Ractor#take was replaced at Ruby 3.5. -+ # https://bugs.ruby-lang.org/issues/21262 -+ r.join -+ end - end.not_to raise_error - end - end diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index fc91392..c640e41 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -8,8 +8,8 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ %{nil} Name: rubygem-%{gem_name} -Version: 6.1.4 -Release: 2%{?dist} +Version: 6.1.5 +Release: 1%{?dist} Summary: Ruby binding to ImageMagick # SPDX confirmed @@ -19,9 +19,6 @@ 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/1712 -# Ractor#take is removed on ruby3_5 -Patch0: rmagick-pr1712-Ractor_take_removal.patch BuildRequires: gcc-c++ BuildRequires: rubygems-devel @@ -65,7 +62,6 @@ Documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 -%patch -P0 -p1 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec # permission @@ -149,6 +145,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Sun Dec 28 2025 Mamoru TASAKA - 6.1.5-1 +- 6.1.5 + * Wed Oct 29 2025 Mamoru TASAKA - 6.1.4-2 - Apply upstream patch for ruby3_5 Ractor change for testsuite diff --git a/sources b/sources index 72f4739..6a164e1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rmagick-6.1.4.gem) = 85fbe577a82f16e46394551ea0a94aa49afea53f955ce0c8889cf4527e658ab7e5fd646b1994d63c983a75281c4b2de8c12f89c5573f76732ac947fd6894b842 -SHA512 (rubygem-rmagick-6.1.4-full.tar.gz) = dc831d7459af0888eefba8fb172be0f910a7ce8f41709153923036f190de2d63d96368cc13a14f571c9b17383852d48929d21ff0a7c84689bf867ac7c22a6dbc +SHA512 (rmagick-6.1.5.gem) = 15157dda3185e8677c08d9b33564d1c85e3c3573ad9f6ab2358c32ec8a790eb2aa765cde095f98eb500cd818e3b71535dd289524eb35c9c5e721be3af4b1ba18 +SHA512 (rubygem-rmagick-6.1.5-full.tar.gz) = ce65bacd8e775fc4751784d427ab52a5b936ca5a465751d63380d42e0928911389f3388474c936eeb59d93d242c9923240168911705c1243b8e5d195d258fd8a From 624242d85b962138b0622763bdaf40cc5fa82c4d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Jan 2026 15:00:09 +0900 Subject: [PATCH 26/26] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 --- rubygem-rmagick.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index c640e41..5d0da22 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -9,7 +9,7 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ Name: rubygem-%{gem_name} Version: 6.1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ruby binding to ImageMagick # SPDX confirmed @@ -145,6 +145,9 @@ done %doc %{gem_instdir}/examples/ %changelog +* Thu Jan 08 2026 Mamoru TASAKA - 6.1.5-2 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 + * Sun Dec 28 2025 Mamoru TASAKA - 6.1.5-1 - 6.1.5