3 changed files with 72 additions and 21 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/xorgproto-2022.2.tar.xz
+SOURCES/xorgproto-2024.1.tar.xz
--- a/.xorg-x11-proto-devel.metadata
+++ b/.xorg-x11-proto-devel.metadata
@ -1 +1 @@
-c04081d31e06e771a673c7af9df989bf95ac2d8c SOURCES/xorgproto-2022.2.tar.xz
+49a078b1150463d0b633c6c75becf291b318a8c8 SOURCES/xorgproto-2024.1.tar.xz
--- a/SPECS/xorg-x11-proto-devel.spec
+++ b/SPECS/xorg-x11-proto-devel.spec
@ -5,9 +5,9 @@

 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
-Version: 2022.2
-Release: 1%{?dist}
-License: MIT
+Version: 2024.1
+Release: 3%{?dist}
+License: BSD-2-Clause AND HPND AND HPND-sell-variant AND ICU AND MIT AND MIT-open-group AND SGI-B-2.0 AND SMLNJ AND X11 AND X11-distribute-modifications-variant
 URL: https://www.x.org
 BuildArch: noarch

@ -15,10 +15,9 @@ Source0:  https://www.x.org/pub/individual/proto/xorgproto-%{version}.tar.xz

 Source40: make-git-snapshot.sh

-BuildRequires: make
+BuildRequires: gcc
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-util-macros >= 1.0.2-1
-BuildRequires: autoconf automake libtool
+BuildRequires: meson

 %description
 X.Org X11 Protocol headers
@ -28,13 +27,11 @@ X.Org X11 Protocol headers
 %autosetup -n xorgproto-%{version}

 %build
-autoreconf -f -i -v
-%configure --disable-specs
-make %{?_smp_mflags}
-
+%meson
+%meson_build

 %install
-%make_install
+%meson_install

 # trim some fat
 for i in apple windows trap ; do
@ -212,18 +209,72 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
 %{_docdir}/xorgproto/*

 %changelog
-* Tue Mar 21 2023 Olivier Fourdan <ofourdan@redhat.com> - 2022.2-1
-  xorgproto 2022.2 (#2179319)
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2024.1-3
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2024.1-2
+- Rebuilt for MSVSphere 10
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2024.1-2
+- Bump release for June 2024 mass rebuild
+
+* Tue Apr 30 2024 Olivier Fourdan <ofourdan@redhat.com> - 2024.1-1
+- xorgproto 2024.1
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2023.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Sep 07 2023 José Expósito <jexposit@redhat.com> - 2023.2-3
+- SPDX Migration
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2023.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jun 16 2023 Olivier Fourdan <ofourdan@redhat.com> - 2023.2-1
+- xorgproto 2023.2
+
+* Mon Jun  5 2023 Olivier Fourdan <ofourdan@redhat.com> - 2023.1-1
+- xorgproto 2023.1

-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2021.4-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2022.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Aug 11 2022 Peter Hutterer <peter.hutterer@redhat.com> - 2022.2-2
+- xorgproto 2022.2
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2022.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Apr 21 2022 Peter Hutterer <peter.hutterer@redhat.com> - 2022.1-1
+- xorgproto 2022.1
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2021.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Sep 16 2021 Peter Hutterer <peter.hutterer@redhat.com> - 2021.5-1
+- xorgproto 2021.5
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2021.4.99.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Adam Jackson <ajax@redhat.com> - 2021.4.99.2-1
+- Prerelease for inputproto snapshot
+
+* Wed Jun 02 2021 Adam Jackson <ajax@redhat.com> - 2021.4-2
+- Build with meson not autotools

 * Fri Apr 30 2021 Peter Hutterer <peter.hutterer@redhat.com> 2021.4-1
- xorgproto 2021.4 (#1954344)
+- xorgproto 2021.4 with XFixes 6
+
+* Thu Feb 25 2021 Peter Hutterer <peter.hutterer@redhat.com> 2021.3-1
+- xorgproto 2021.3 (no changes except the tarball no longer fails with meson)
+- clean up the gitignore file

-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2019.1-7
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Wed Feb 24 2021 Peter Hutterer <peter.hutterer@redhat.com> 2021.2-1
+- xorgproto 2021.2
+- Remove two header files that belong to libX11/libXv and are now part of
+  the --enable-legacy build only

 * Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2019.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild