From 8a48a8e7c2747b01db663469303c2876cdb71c7c Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 16 Mar 2024 12:12:39 +0100
Subject: [PATCH] resolve conflicts with mesa-tests [release 3.1.1-2mamba;Sat
 Mar 16 2024]

---
 virtualgl.spec | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/virtualgl.spec b/virtualgl.spec
index 46f823b..e150330 100644
--- a/virtualgl.spec
+++ b/virtualgl.spec
@@ -1,23 +1,23 @@
 Name:          virtualgl
-Version:       3.1
-Release:       1mamba
+Version:       3.1.1
+Release:       2mamba
 Summary:       Redirects 3D commands from a Unix/Linux OpenGL application onto a server-side 3D graphics card
 Group:         System/X11
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://virtualgl.org/
-Source:        http://downloads.sourceforge.net/project/virtualgl/%{version}/VirtualGL-%{version}.tar.gz
+Source:        https://github.com/VirtualGL/virtualgl.git/%{version}/virtualgl-%{version}.tar.bz2
 License:       LGPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-BuildRequires: libGLU-devel
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 BuildRequires: libXtst-devel
 BuildRequires: libXv-devel
 BuildRequires: libfltk-devel
 BuildRequires: libgcc
+BuildRequires: libglu-devel
 BuildRequires: libglvnd-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libstdc++6-devel
@@ -40,7 +40,7 @@ Demos for %{name}.
 %debug_package
 
 %prep
-%setup -q -n VirtualGL-%{version}
+%setup -q
 
 %build
 %cmake -d build \
@@ -58,6 +58,10 @@ Demos for %{name}.
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 %makeinstall -C build
 
+# Resolve conflicts with mesa-tests
+mv %{buildroot}%{_bindir}/{,v}glxinfo
+mv %{buildroot}%{_bindir}/{,v}eglinfo
+
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
@@ -84,16 +88,22 @@ Demos for %{name}.
 %files demos
 %defattr(-,root,root)
 %{_bindir}/cpustat
-%{_bindir}/eglinfo
+%{_bindir}/veglinfo
 %{_bindir}/eglxinfo
 %{_bindir}/eglxspheres*
 %{_bindir}/glreadtest
-%{_bindir}/glxinfo
+%{_bindir}/vglxinfo
 %{_bindir}/glxspheres*
 %{_bindir}/nettest
 %{_bindir}/tcbench
 
 %changelog
+* Sat Mar 16 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 3.1.1-2mamba
+- resolve conflicts with mesa-tests
+
+* Thu Mar 14 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 3.1.1-1mamba
+- update to 3.1.1
+
 * Fri Mar 31 2023 Automatic Build System <autodist@mambasoft.it> 3.1-1mamba
 - automatic version update by autodist