From 705649f32ec9e014bec41d9cea0f36f2bd412785 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 07:06:23 +0100 Subject: [PATCH] restore previous install code removing conflicting files bitmap and clear [release 8.5.0-2mamba;Tue Aug 30 2022] --- mesa-demos.spec | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index f2f86bd..b750954 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -1,6 +1,6 @@ Name: mesa-demos Version: 8.5.0 -Release: 1mamba +Release: 2mamba Summary: Demos for the Mesa GL libraries Group: Applications/Graphics Vendor: openmamba @@ -60,13 +60,12 @@ Test and information tools for the Mesa libraries. [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %meson_install -:<< __OLD -install -D -m0755 src/egl/opengl/eglgears_x11 %{buildroot}%{_bindir}/eglgears -install -D -m0755 src/egl/opengl/eglinfo %{buildroot}%{_bindir}/eglinfo -#install -D -m0755 src/egl/opengles1/gears_x11 %{buildroot}%{_bindir}/es1gears -#install -D -m0755 src/egl/opengles1/es1_info %{buildroot}%{_bindir}/es1_info -install -D -m0755 src/egl/opengles2/es2gears_x11 %{buildroot}%{_bindir}/es2gears -install -D -m0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir}/es2_info +install -D -m0755 build/src/egl/opengl/eglgears_x11 %{buildroot}%{_bindir}/eglgears +#install -D -m0755 build/src/egl/opengl/eglinfo %{buildroot}%{_bindir}/eglinfo +#install -D -m0755 build/src/egl/opengles1/gears_x11 %{buildroot}%{_bindir}/es1gears +#install -D -m0755 build/src/egl/opengles1/es1_info %{buildroot}%{_bindir}/es1_info +#install -D -m0755 build/src/egl/opengles2/es2gears_x11 %{buildroot}%{_bindir}/es2gears +#install -D -m0755 build/src/egl/opengles2/es2_info %{buildroot}%{_bindir}/es2_info rm -f %{buildroot}%{_bindir}/bitmap rm -f %{buildroot}%{_bindir}/clear @@ -78,7 +77,7 @@ rm -f %{buildroot}%{_bindir}/clear %defattr(-,root,root) %{_bindir}/glxgears %{_bindir}/glxinfo -#%{_bindir}/eglgears +%{_bindir}/eglgears %{_bindir}/eglinfo %{_bindir}/es2gears* %{_bindir}/es2_info @@ -90,7 +89,7 @@ rm -f %{buildroot}%{_bindir}/clear %exclude %{_bindir}/glxinfo %exclude %{_bindir}/glxgears %exclude %{_bindir}/glxinfo -#%exclude %{_bindir}/eglgears +%exclude %{_bindir}/eglgears %exclude %{_bindir}/eglinfo %exclude %{_bindir}/es2gears* %exclude %{_bindir}/es2_info @@ -98,6 +97,9 @@ rm -f %{buildroot}%{_bindir}/clear %{_datadir}/mesa-demos/* %changelog +* Tue Aug 30 2022 Silvan Calarco 8.5.0-2mamba +- restore previous install code removing conflicting files bitmap and clear + * Thu Jun 09 2022 Silvan Calarco 8.5.0-1mamba - update to 8.5.0