diff --git a/0001-Remove-requirement-for-accum-buffers.patch b/0001-Remove-requirement-for-accum-buffers.patch
new file mode 100644
index 0000000..fa25745
--- /dev/null
+++ b/0001-Remove-requirement-for-accum-buffers.patch
@@ -0,0 +1,27 @@
+From 914543a4f30de53cd33c2961e8791bf44d29aedf Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <ofourdan@redhat.com>
+Date: Wed, 4 Sep 2024 15:04:27 +0200
+Subject: [PATCH] Remove requirement for accum buffers
+
+Mesa's swrast with dril does not expose these anymore, so the tests
+fail trying to find a matching config.
+---
+ lib/opengl/test_case.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/opengl/test_case.rb b/lib/opengl/test_case.rb
+index e14dac3..4acf91e 100644
+--- a/lib/opengl/test_case.rb
++++ b/lib/opengl/test_case.rb
+@@ -39,7 +39,7 @@ class OpenGL::TestCase < MiniTest::Unit::TestCase
+ 
+   glutInit
+   glutInitDisplayMode(GLUT_DEPTH | GLUT_DOUBLE | GLUT_RGBA | GLUT_STENCIL |
+-                      GLUT_ACCUM | GLUT_ALPHA)
++                      GLUT_ALPHA)
+ 
+   def setup
+     glutInitWindowPosition 1, 1
+-- 
+2.46.0
+
diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec
index f0c857c..1696b1c 100644
--- a/rubygem-opengl.spec
+++ b/rubygem-opengl.spec
@@ -14,7 +14,7 @@
 
 Name:		rubygem-%{gem_name}
 Version:	0.10.0
-Release:	32%{?dist}
+Release:	39%{?dist}
 
 Summary:	An OpenGL wrapper for Ruby
 # SPDX confirmed
@@ -31,6 +31,9 @@ Source1:	create-clean-opengl-gem.sh
 Source2:	GPLv1.rubygem_opengl
 # Fix for -Werror=incompatible-pointer-types
 Patch0:	opengl-0.10.0-pointer-types.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=2303995#c20
+# Mesa 24.2.2 swrast with dril does not expose accum buffers anymore
+Patch1:	0001-Remove-requirement-for-accum-buffers.patch
 
 # MRI (CRuby) only
 BuildRequires:	gcc
@@ -80,6 +83,9 @@ sed -i.minitest \
 	lib/opengl/test_case.rb
 
 %patch -P0 -p1 -b .types
+%if 0%{?fedora} >= 41
+%patch -P1 -p1 -b .accum
+%endif
 
 %build
 gem build %{gem_name}.gemspec
@@ -126,7 +132,7 @@ exit 0
 
 pushd .%{gem_instdir}
 
-EXPECTED_TEST_MSG="184 runs, 174[45] assertions, 6 failures, [12] errors, 14 skips"
+EXPECTED_TEST_MSG="184 runs, 17\(38\|44\|45\) assertions, 6 failures, [12] errors, 14 skips"
 
 export RUBYLIB=%{buildroot}%{gem_extdir_mri}/:$(pwd)/lib:$(pwd)
 # try twice
@@ -143,7 +149,7 @@ for trial in 1 2 ; do
 	STATUS_ON_FAILURE=false
 %endif
 %ifarch s390x
-%if 0%{?fedora} >= 40
+%if 0%{?fedora} == 40
 	# Currently mesa on F41, s390x is fairly broken
 	STATUS_ON_FAILURE=true
 %endif
@@ -169,6 +175,29 @@ popd
 %doc	%{gem_instdir}/utils/
 
 %changelog
+* Thu Jan 08 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.0-39
+- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-38
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-37
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Jan 08 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.0-36
+- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4
+
+* Fri Sep 06 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.0-35
+- Adjust to mesa 24.2.2 change that swrast with dril does not expose
+  accum buffers anymore
+- Adjust test result message with recent mesa
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Jul 12 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.0-33
+- Enable s390x test on F41 again
+
 * Mon Jun 17 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.10.0-32
 - Use regex match for test result