rubygem-glu-c99.patch

@@ -1,63 +0,0 @@
-VALUE casts for rb_funcall arguments
-
-The Ruby API expects VALUE types instead of void *, so add casts. This
-avoids compilation errors with current compilers.
-
-Submitted upstream: <https://github.com/larskanis/glu/pull/3>
-
-diff -ur glu-8.3.0.orig/ext/glu/glu.c glu-8.3.0/ext/glu/glu.c
---- glu-8.3.0.orig/ext/glu/glu.c	2024-01-05 11:12:18.598561476 +0100
-+++ glu-8.3.0/ext/glu/glu.c	2024-01-05 11:18:42.217732888 +0100
-@@ -636,7 +636,7 @@
- void* data;
- {
-   TESS_CALLBACK_COMMON
--  rb_funcall(rb_ary_entry(tdata->t_ref, TESS_VERTEX), callId, 1, data);
-+  rb_funcall(rb_ary_entry(tdata->t_ref, TESS_VERTEX), callId, 1, (VALUE) data);
- }
- static void CALLBACK
- t_end()
-@@ -657,7 +657,7 @@
- void* user_data;
- {
-   TESS_CALLBACK_COMMON
--  rb_funcall(rb_ary_entry(tdata->t_ref, TESS_BEGIN_DATA), callId, 2, INT2NUM(type), user_data);
-+  rb_funcall(rb_ary_entry(tdata->t_ref, TESS_BEGIN_DATA), callId, 2, INT2NUM(type), (VALUE) user_data);
- }
- static void CALLBACK
- t_edgeFlag_data(flag, user_data)
-@@ -665,7 +665,7 @@
- void* user_data;
- {
-   TESS_CALLBACK_COMMON
--  rb_funcall(rb_ary_entry(tdata->t_ref, TESS_EDGE_FLAG_DATA), callId, 2, GLBOOL2RUBY(flag), user_data);
-+  rb_funcall(rb_ary_entry(tdata->t_ref, TESS_EDGE_FLAG_DATA), callId, 2, GLBOOL2RUBY(flag), (VALUE) user_data);
- }
- static void CALLBACK
- t_vertex_data(data, user_data)
-@@ -673,14 +673,14 @@
- void* user_data;
- {
-   TESS_CALLBACK_COMMON
--  rb_funcall(rb_ary_entry(tdata->t_ref, TESS_VERTEX_DATA), callId, 2, data, user_data);
-+  rb_funcall(rb_ary_entry(tdata->t_ref, TESS_VERTEX_DATA), callId, 2, (VALUE) data, (VALUE) user_data);
- }
- static void CALLBACK
- t_end_data(user_data)
- void* user_data;
- {
-   TESS_CALLBACK_COMMON
--  rb_funcall(rb_ary_entry(tdata->t_ref, TESS_END_DATA), callId, 1, user_data);
-+  rb_funcall(rb_ary_entry(tdata->t_ref, TESS_END_DATA), callId, 1, (VALUE) user_data);
- }
- static void CALLBACK
- t_error_data(errorno, user_data)
-@@ -688,7 +688,7 @@
- void* user_data;
- {
-   TESS_CALLBACK_COMMON
--  rb_funcall(rb_ary_entry(tdata->t_ref, TESS_ERROR_DATA), callId, 2, INT2NUM(errorno), user_data);
-+  rb_funcall(rb_ary_entry(tdata->t_ref, TESS_ERROR_DATA), callId, 2, INT2NUM(errorno), (VALUE) user_data);
- }
- 
- static void CALLBACK

rubygem-glu.spec

@@ -1,17 +1,15 @@
 %global	gem_name	glu
 
-%bcond_without bootstrap
+%global	need_bootstrap	0
 
 Name:		rubygem-%{gem_name}
 Version:	8.3.0
-Release:	27.0.riscv64%{?dist}
+Release:	23%{?dist}
 
 Summary:	Glu bindings for the opengl gem
-# SPDX confirmed
 License:	MIT
 URL:		https://github.com/larskanis/glu
 Source0:	https://rubygems.org/gems/%{gem_name}-%{version}.gem
-Patch1:		rubygem-glu-c99.patch
 
 BuildRequires:	gcc
 BuildRequires:	rubygems-devel 
@@ -19,15 +17,17 @@ BuildRequires:	ruby-devel
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
 # %%check
-%if %{without bootstrap}
+%if 0%{?need_bootstrap} < 1
 BuildRequires:	rubygem(minitest) >= 5
 BuildRequires:	rubygem(opengl)
 BuildRequires:	%{_bindir}/xvfb-run
 BuildRequires:	mesa-dri-drivers
 BuildRequires:	rubygem(opengl) >= 0.9
 BuildRequires:	rubygem(glut)
+%if 0%{?fedora} >= 36
 BuildRequires:	rubygem(matrix)
 %endif
+%endif
 
 %description
 Glu bindings for the opengl gem.
@@ -41,11 +41,12 @@ BuildArch:	noarch
 Documentation for %{name}.
 
 %prep
-%autosetup -p1 -n %{gem_name}-%{version}
-mv ../%{gem_name}-%{version}.gemspec .
+gem unpack %{SOURCE0}
+%setup -q -D -T -n  %{gem_name}-%{version}
+gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
 
 %build
-gem build %{gem_name}-%{version}.gemspec
+gem build %{gem_name}.gemspec
 %gem_install
 
 %install
@@ -56,11 +57,8 @@ cp -a .%{gem_dir}/* \
 mkdir -p %{buildroot}%{gem_extdir_mri}
 cp -a .%{gem_extdir_mri}/* %{buildroot}%{gem_extdir_mri}/
 
-pushd %{buildroot}%{gem_extdir_mri}
-rm -f \
-	gem_make.out \
-	mkmf.log \
-	%{nil}
+pushd %{buildroot}
+rm -f .%{gem_extdir_mri}/{gem_make.out,mkmf.log}
 popd
 
 
@@ -71,20 +69,19 @@ rm -rf \
 	ext/ \
 	test/
 popd
-rm -f %{buildroot}%{gem_cache}
 
 %check
-%if %{without bootstrap}
+%if 0%{?need_bootstrap} < 1
 pushd .%{gem_instdir}
 
 %ifarch %arm
 exit 0
 %endif
 
-export RUBYLIB=$(pwd)/lib:$(pwd):%{buildroot}%{gem_extdir_mri}
 xvfb-run \
 	-s "-screen 0 640x480x24" \
 	ruby \
+		-Ilib:.:%{buildroot}%{gem_extdir_mri} \
 		-e "Dir.glob('test/test_*.rb').each { |f| require f }"
 popd
 %endif
@@ -98,28 +95,14 @@ popd
 
 %{gem_libdir}/
 %{gem_extdir_mri}/
+
+%exclude	%{gem_cache}
 %{gem_spec}
 
 %files doc
 %doc	%{gem_docdir}
 
 %changelog
-* Mon Jan 08 2024 David Abdurachmanov <davidlt@rivosinc.com> - 8.3.0-27.0.riscv64
-- Bootstrap (riscv64)
-
-* Fri Jan 05 2024 Florian Weimer <fweimer@redhat.com> - 8.3.0-27
-- Fix C compatibility issues
-
-* Wed Jan 03 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 8.3.0-26
-- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3
-
-* Sun Dec 24 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 8.3.0-25
-- Use recent gem2rpm style
-- Use recent bootstrap style
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.0-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.0-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild