- rebuild with guile 3.0, rel 3

diff --git a/guile-opengl.spec b/guile-opengl.spec
index 3ed86fa3ca6be919fc20bdd5e463dfb6a723c217..4bf25fbdc19d1dd6b1a203e5532b0595bb3e7bdf 100644 (file)
--- a/guile-opengl.spec
+++ b/guile-opengl.spec
@@ -2,12 +2,13 @@ Summary:      Guile-OpenGL - OpenGL interface for GNU Guile
 Summary(pl.UTF-8):     Guile-OpenGL - interfejs OpenGL dla GNU Guile
 Name:          guile-opengl
 Version:       0.1.0
-Release:       2
+Release:       3
 License:       LGPL v3+
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/guile-opengl/%{name}-%{version}.tar.gz
 # Source0-md5: a5d20170103514a042bb13d28f586472
 Patch0:                %{name}-info.patch
+Patch1:                guile3.0.patch
 URL:           http://www.gnu.org/software/guile-opengl/
 BuildRequires: guile-devel >= 5:2.0
 BuildRequires: rpmbuild(macros) >= 1.721
@@ -20,6 +21,8 @@ Suggests:     %{_soname_prov libglut.so.3}
 %endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _debugsource_packages   0
+
 %description
 GNU Guile-OpenGL is an OpenGL interface for GNU Guile.
 
@@ -29,8 +32,12 @@ GNU Guile-OpenGL to interfejs OpenGL dla GNU Guile.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure \
        --disable-silent-rules
 
@@ -54,20 +61,20 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS LICENSE NEWS README TODO
-%{_libdir}/guile/2.2/ccache/gl
-%{_libdir}/guile/2.2/ccache/glu
-%{_libdir}/guile/2.2/ccache/glut
-%{_libdir}/guile/2.2/ccache/glx
-%{_libdir}/guile/2.2/ccache/gl.go
-%{_libdir}/guile/2.2/ccache/glu.go
-%{_libdir}/guile/2.2/ccache/glut.go
-%{_libdir}/guile/2.2/ccache/glx.go
-%{_datadir}/guile/site/2.2/gl
-%{_datadir}/guile/site/2.2/glu
-%{_datadir}/guile/site/2.2/glut
-%{_datadir}/guile/site/2.2/glx
-%{_datadir}/guile/site/2.2/gl.scm
-%{_datadir}/guile/site/2.2/glu.scm
-%{_datadir}/guile/site/2.2/glut.scm
-%{_datadir}/guile/site/2.2/glx.scm
+%{_libdir}/guile/*.*/ccache/gl
+%{_libdir}/guile/*.*/ccache/glu
+%{_libdir}/guile/*.*/ccache/glut
+%{_libdir}/guile/*.*/ccache/glx
+%{_libdir}/guile/*.*/ccache/gl.go
+%{_libdir}/guile/*.*/ccache/glu.go
+%{_libdir}/guile/*.*/ccache/glut.go
+%{_libdir}/guile/*.*/ccache/glx.go
+%{_datadir}/guile/site/*.*/gl
+%{_datadir}/guile/site/*.*/glu
+%{_datadir}/guile/site/*.*/glut
+%{_datadir}/guile/site/*.*/glx
+%{_datadir}/guile/site/*.*/gl.scm
+%{_datadir}/guile/site/*.*/glu.scm
+%{_datadir}/guile/site/*.*/glut.scm
+%{_datadir}/guile/site/*.*/glx.scm
 %{_infodir}/guile-opengl.info*

diff --git a/guile3.0.patch b/guile3.0.patch
new file mode 100644 (file)
index 0000000..cfa12e9
--- /dev/null
+++ b/guile3.0.patch
@@ -0,0 +1,11 @@
+--- guile-opengl-0.1.0/configure.ac~   2014-03-23 15:33:38.000000000 +0100
++++ guile-opengl-0.1.0/configure.ac    2022-03-12 14:16:32.352844220 +0100
+@@ -27,7 +27,7 @@
+ AM_INIT_AUTOMAKE([color-tests -Wall -Wno-portability serial-tests])
+ AM_SILENT_RULES([yes])
+ 
+-GUILE_PKG([2.2 2.0])
++GUILE_PKG([3.0 2.2 2.0])
+ GUILE_PROGS
+ 
+ AC_CONFIG_FILES([Makefile gl/config.scm])