3 changed files with 32 additions and 68 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/libdrm-2.4.121.tar.xz
+SOURCES/libdrm-2.4.115.tar.xz
--- a/.libdrm.metadata
+++ b/.libdrm.metadata
@ -1 +1 @@
-dc61485b577eb7a69ad68d76cfac3ff033af87a0 SOURCES/libdrm-2.4.121.tar.xz
+0842e73f1710317adb7f42c4e313eb9e727d9f15 SOURCES/libdrm-2.4.115.tar.xz
--- a/SPECS/libdrm.spec
+++ b/SPECS/libdrm.spec
@ -22,18 +22,20 @@ end}
 %bcond_without amdgpu
 %bcond_without nouveau
 %bcond_without vmwgfx
-# Not (currently) used on non arm32
+%ifarch %{arm}
+%bcond_without omap
+%else
 %bcond_with    omap
-%bcond_with    exynos
-%ifarch aarch64
+%endif
+%ifarch %{arm} aarch64
+%bcond_without exynos
 %bcond_without freedreno
-%bcond_without freedreno_kgsl
 %bcond_without tegra
 %bcond_without vc4
 %bcond_without etnaviv
 %else
+%bcond_with    exynos
 %bcond_with    freedreno
-%bcond_with    freedreno_kgsl
 %bcond_with    tegra
 %bcond_with    vc4
 %bcond_with    etnaviv
@ -45,13 +47,14 @@ end}
 %else
 %bcond_with    valgrind
 %endif
+%bcond_with    freedreno_kgsl
 %bcond_without install_test_programs
 %bcond_without udev

 Name:           libdrm
 Summary:        Direct Rendering Manager runtime library
-Version:        2.4.121
-Release:        2%{?dist}
+Version:        2.4.115
+Release:        1%{?dist}
 License:        MIT

 URL:            https://dri.freedesktop.org
@ -206,7 +209,7 @@ cp %{SOURCE1} %{buildroot}%{_docdir}/libdrm
 %{_libdir}/pkgconfig/libdrm_intel.pc
 %endif
 %if %{with radeon}
-%{_includedir}/libdrm/radeon_{bo,cs,surface}*.h
+%{_includedir}/libdrm/radeon_*.h
 %{_includedir}/libdrm/r600_pci_ids.h
 %{_libdir}/libdrm_radeon.so
 %{_libdir}/pkgconfig/libdrm_radeon.pc
@ -262,83 +265,44 @@ cp %{SOURCE1} %{buildroot}%{_docdir}/libdrm

 %if %{with install_test_programs}
 %files -n drm-utils
-%if %{with amdgpu}
 %{_bindir}/amdgpu_stress
-%endif
 %{_bindir}/drmdevice
-%if %{with etnaviv}
 %exclude %{_bindir}/etnaviv_*
-%endif
-%if %{with exynos}
 %exclude %{_bindir}/exynos_*
-%endif
-%if %{with tegra}
-%exclude %{_bindir}/tegra-*
-%endif
 %{_bindir}/modeprint
 %{_bindir}/modetest
 %{_bindir}/proptest
 %{_bindir}/vbltest
+%if %{with tegra}
+%{_bindir}/tegra-*
+%endif
 %endif

 %changelog
-* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.4.121-2
- Rebuilt for MSVSphere 10
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.4.121-2
- Bump release for June 2024 mass rebuild
-
-* Wed Jun 05 2024 José Expósito <jexposit@redhat.com> - 2.4.121-1
- Update to 2.4.121
-
-* Mon May 27 2024 José Expósito <jexposit@redhat.com> - 2.4.120-4
- Fix findings from static application security testing (SAST)
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.120-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.120-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+* Wed May 17 2023 Dave Airlie <airlied@redhat.com> - 2.4.115-1
+- Update to 2.4.115

-* Sun Jan 14 2024 Peter Robinson <pbrobinson@fedoraproject.org> - 2.4.120-1
- Update to 2.4.120
- Drop arm32 pieces
-
-* Tue Oct 24 2023 José Expósito <jexposit@redhat.com> - 2.4.117-1
- Update to 2.4.117
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.114-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.114-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Nov 10 2022 Dave Airlie <airlied@redhat.com> - 2.4.114-1
+* Thu Nov 10 2022 Dave Airlie <airlied@redhat.com> - 2.4.111-1
 - Update to 2.4.114

-* Sat Aug 06 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 2.4.112-1
- Update to 2.4.112
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.110-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Feb 23 2022 Dave Airlie <airlied@redhat.com> - 2.4.110-1
- Update to 2.4.110
+* Fri Jun 10 2022 Dave Airlie <airlied@redhat.com> - 2.4.111-1
+- Update to 2.4.111

-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.109-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+* Mon Nov 22 2021 Dave Airlie <airlied@redhat.com> - 2.4.108-1
+- Update to 2.4.108

-* Mon Nov 29 2021 Adam Jackson <ajax@redhat.com> - 2.4.109-1
- Update to 2.4.109
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.107-3
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.107-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* Thu Jul 08 2021 Dave Airlie <airlied@redhat.com> - 2.4.107-2
+- annobin rebuild

-* Tue Jul 06 2021 Dave Airlie <airlied@redhat.com> - 2.4.107-1
+* Wed Jul 07 2021 Dave Airlie <airlied@redhat.com> - 2.4.107-1
 - Update to 2.4.107

-* Fri Apr 16 2021 Pete Walter <pwalter@fedoraproject.org> - 2.4.105-1
- Update to 2.4.105
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.103-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.103-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@ -638,7 +602,7 @@ cp %{SOURCE1} %{buildroot}%{_docdir}/libdrm

 * Thu Jan 17 2013 Adam Jackson <ajax@redhat.com> 2.4.41-1
 - libdrm 2.4.41 plus git.  Done as a git snapshot instead of the released
-  2.4.41 since the release tarball is missing man/ entirely.
+  2.4.41 since the release tarball is missing man/ entirely. 
 - Pre-F16 changelog trim

 * Wed Jan 09 2013 Ben Skeggs <bskeggs@redhat.com> 2.4.40-2