SPECS/libglvnd.spec

@@ -1,13 +1,10 @@
-#global commit0 5baa1e5cfc422eb53e66f12ffb80c93d4a693cd9
+#global commit0 f92208be88dd06a70b6f79a1cb95571e2762a9ec
 #global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
 
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%global _without_mesa_glvnd_default 1
-%endif
 
 Name:           libglvnd
 Version:        1.3.4
-Release:        2%{?commit0:.git%{shortcommit0}}%{?dist}
+Release:        1%{?dist}
 # Provide an upgrade path from the negativo17.org pkgs which have Epoch 1
 Epoch:          1
 Summary:        The GL Vendor-Neutral Dispatch library
@@ -19,34 +16,19 @@ Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 Patch0:         libglvnd-python3.patch
 Patch1:         0001-glx-Add-another-fallback-library-name.patch
 
+BuildRequires: make
 BuildRequires:  libtool
 BuildRequires:  gcc
-BuildRequires:  python3-devel
+BuildRequires:  python3-rpm-macros
 BuildRequires:  python3-libxml2
 BuildRequires:  pkgconfig(glproto)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  xorg-x11-server-Xvfb
 
-%if (0%{?rhel} && 0%{?rhel} <= 6)
-BuildRequires:  autoconf268
-%endif
-
 %{?_without_mesa_glvnd_default:
-%if (0%{?rhel} && 0%{?rhel} <= 6)
-
-%{?filter_setup:
-%filter_provides_in %{_libdir}/%{name}
-%filter_requires_in %{_libdir}/%{name}
-%filter_setup
-}
-
-%else
-
 %global __provides_exclude_from %{_libdir}/%{name}
 %global __requires_exclude_from %{_libdir}/%{name}
-
-%endif
 }
 
 %description
@@ -73,10 +55,6 @@ Provides:       mesa-khr-devel = %{epoch}:%{version}-%{release}
 Provides:       mesa-khr-devel%{?_isa} = %{epoch}:%{version}-%{release}
 Provides:       libGLES-devel = %{epoch}:%{version}-%{release}
 Provides:       libGLES-devel%{?_isa} = %{epoch}:%{version}-%{release}
-Conflicts:	mesa-libEGL-devel < 19.3.0-rc1
-Conflicts:	mesa-libGL-devel < 19.3.0-rc1
-Conflicts:	mesa-libGLES-devel < 19.3.0-rc1
-Conflicts:	mesa-khr-devel < 19.3.0-rc1
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -107,7 +85,7 @@ Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 %{!?_without_mesa_glvnd_default:
 # mesa is the default EGL implementation provider
 Requires:       mesa-libEGL%{?_isa} >= 13.0.4-1
-Obsoletes:      mesa-libGLES < 19.2.2-2
+Obsoletes:      mesa-libGLES < 19.3.0~rc1
 Provides:       mesa-libGLES
 Provides:       mesa-libGLES%{?_isa}
 Provides:       libGLES
@@ -148,13 +126,10 @@ libGL and libGLX are the common dispatch interface for the GLX API.
 
 %prep
 %autosetup -p1 -n %{name}-%{?commit0}%{?!commit0:%{version}}
-%if 0%{?rhel} == 6
-autoreconf268 -vif
-%else
 autoreconf -vif
-%endif
 
 %build
+export PYTHON=%{__python3}
 #Prefer asm and tls for x86* and ppc64*
 #armhfp and aarch64 fallback to asm and tsd
 #Others arches fallback to pure-c and tls.
@@ -267,40 +242,87 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \
 
 
 %changelog
-* Wed Feb 21 2024 José Expósito <jexposit@redhat.com> - 1.3.4-2
+* Mon Nov 22 2021 Dave Airlie <airlied@redhat.com> - 1:1.3.4-1
-- Fix BuildRequires for python3-devel
+- Update to 1.3.4 for nvidia drivers
-  Resolves: RHEL-2239
 
-* Wed Nov 17 2021 Dave Airlie <airlied@redhat.com> - 1.3.4-1
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.3.2-5
-- Update to 1.3.4 release
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Mon Nov 16 2020 Dave Airlie <airlied@redhat.com> - 1.3.2-1
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.3.2-4
-- Update to 1.3.2 release
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
-* Mon Nov 25 2019 Dave Airlie <airlied@redhat.com> - 1.2.0-6
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.3.2-3
-- version provides
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
-* Sat Nov 23 2019 Dave Airlie <airlied@redhat.com> - 1.2.0-5
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.3.2-2
-- Add another conflict
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Sat Nov 23 2019 Dave Airlie <airlied@redhat.com> - 1.2.0-4
+* Mon Jun 29 2020 Nicolas Chauvet <kwizart@gmail.com> - 1:1.3.2-1
-- conflict
+- Update to 1.3.2
 
-* Fri Nov 22 2019 Dave Airlie <airlied@redhat.com> - 1.2.0-3
+* Fri May 08 2020 Nicolas Chauvet <kwizart@gmail.com> - 1:1.3.1-2
-- more conflicts
+- Forward few patches from rhel
 
-* Fri Nov 22 2019 Dave Airlie <airlied@redhat.com> - 1.2.0-2
+* Mon Feb 24 2020 Nicolas Chauvet <kwizart@gmail.com> - 1:1.3.1-1
-- add conflicts
+- Update to 1.3.1
 
-* Fri Nov 22 2019 Dave Airlie <airlied@redhat.com> - 1.2.0-1
+* Wed Feb 19 2020 Kalev Lember <klember@redhat.com> - 1:1.3.0-1
+- Update to 1.3.0
+
+* Wed Feb 19 2020 Kalev Lember <klember@redhat.com> - 1:1.2.0-10
+- Bump mesa-libGLES obsoletes version as well
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Nov 01 2019 Pete Walter <pwalter@fedoraproject.org> - 1:1.2.0-8
+- Bump mesa-libGLES-devel and mesa-khr-devel obsoletes versions
+
+* Sat Oct 26 2019 Nicolas Chauvet <kwizart@gmail.com> - 1:1.2.0-7
+- Move from core to main
+
+* Fri Oct 25 2019 Peter Robinson <pbrobinson@gmail.com> - 1:1.2.0-6
+- Add %%{?_isa} too, just for fun!
+
+* Fri Oct 25 2019 Peter Robinson <pbrobinson@gmail.com> - 1:1.2.0-5
+- provides shouldn't have been versioned
+
+* Fri Oct 25 2019 Peter Robinson <pbrobinson@gmail.com> - 1:1.2.0-4
+- Also provide old libGLES-devel
+
+* Fri Oct 25 2019 Peter Robinson <pbrobinson@gmail.com> - 1:1.2.0-4
+- Obsolete/Provide the bits moved from mesa so builds don't break
+
+* Fri Oct 25 2019 Pete Walter <pwalter@fedoraproject.org> - 1:1.2.0-2
+- Sync headers with mesa
+
+* Thu Oct 24 2019 Leigh Scott <leigh123linux@gmail.com> - 1:1.2.0-1
 - libglvnd 1.2.0
 
-* Tue Aug 14 2018 Petr Viktorin <pviktori@redhat.com> - 1.0.1-0.9.git5baa1e5
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1.1-5
-- Fix BuildRequires for /usr/bin/python3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-- Resolves: #1615543
 
-* Tue Jul 24 2018 Dave Airlie <airlied@redhat.com> - 1.0.1-0.8.git5baa1e5
+* Thu Mar 14 2019 Adam Jackson <ajax@redhat.com> - 1.1.1-4
-- rename fallback to system
+- libglvnd 1.1.1
+
+* Thu Feb 14 2019 Nicolas Chauvet <kwizart@gmail.com> - 1:1.1.0-4.gitf92208b
+- Update snapshot
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Aug 16 2018 Leigh Scott <leigh123linux@googlemail.com> - 1:1.1.0-2
+- Add upstream python3 PR
+
+* Thu Aug 09 2018 Leigh Scott <leigh123linux@googlemail.com> - 1:1.1.0-1
+- Update to 1.1.0 release
+
+* Tue Jul 24 2018 Dave Airlie <airlied@redhat.com> - 1.0.1-0.9.git5baa1e5
+- rename fallback from fedora to system
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.1-0.8.git5baa1e5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Thu Jun 14 2018 Adam Jackson <ajax@redhat.com> - 1.0.1-0.7.git5baa1e5
 - Add another fallback GLX library name