diff --git a/.gitignore b/.gitignore index ba0305c..d6c751d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/xorgproto-2020.1.tar.bz2 +xorgproto-2024.1.tar.xz diff --git a/.xorg-x11-proto-devel.metadata b/.xorg-x11-proto-devel.metadata deleted file mode 100644 index 161e4dc..0000000 --- a/.xorg-x11-proto-devel.metadata +++ /dev/null @@ -1 +0,0 @@ -1cdab4e9ab796760ddb9582071328469a8eca08a SOURCES/xorgproto-2020.1.tar.bz2 diff --git a/SOURCES/make-git-snapshot.sh b/make-git-snapshot.sh similarity index 100% rename from SOURCES/make-git-snapshot.sh rename to make-git-snapshot.sh diff --git a/sources b/sources new file mode 100644 index 0000000..283e972 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (xorgproto-2024.1.tar.xz) = 63955cb604ff831575af2193548857c1b99e52d00206ea9421ce99e145094bcd907388c4574bc32174a01cbe2c940b0377bf75ae7d2c0f953157dc9c32e5a07f diff --git a/SPECS/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec similarity index 77% rename from SPECS/xorg-x11-proto-devel.spec rename to xorg-x11-proto-devel.spec index 874b38b..34ae106 100644 --- a/SPECS/xorg-x11-proto-devel.spec +++ b/xorg-x11-proto-devel.spec @@ -5,19 +5,19 @@ Summary: X.Org X11 Protocol headers Name: xorg-x11-proto-devel -Version: 2020.1 +Version: 2024.1 Release: 3%{?dist} -License: MIT +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 -Source0: https://www.x.org/pub/individual/proto/xorgproto-%{version}.tar.bz2 +Source0: https://www.x.org/pub/individual/proto/xorgproto-%{version}.tar.xz Source40: make-git-snapshot.sh +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 @@ -27,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 @@ -44,14 +42,6 @@ done # keep things building even if you have the html doc tools for xmlto installed rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg} -# temporary workaround for 8.3, we need to keep shipping the xf86misc stuff -# from this package until we rebase libXxf86misc again. -install -p include/X11/extensions/xf86m* $RPM_BUILD_ROOT%{_includedir}/X11/extensions -install -p xf86miscproto.pc $RPM_BUILD_ROOT%{_datadir}/pkgconfig -# temporary workaround for 8.3, we need to keep shipping XKBgeom.h -# from this package until we rebase libX11 again. -install -p include/X11/extensions/XKBgeom.h $RPM_BUILD_ROOT%{_includedir}/X11/extensions - %files %doc COPYING-* %doc *.txt @@ -157,7 +147,6 @@ install -p include/X11/extensions/XKBgeom.h $RPM_BUILD_ROOT%{_includedir}/X11/ex %{_includedir}/X11/extensions/syncconst.h %{_includedir}/X11/extensions/syncproto.h %{_includedir}/X11/extensions/syncstr.h -%{_includedir}/X11/extensions/XKBgeom.h %{_includedir}/X11/extensions/xcmiscproto.h %{_includedir}/X11/extensions/xcmiscstr.h %{_includedir}/X11/extensions/xf86bigfont.h @@ -170,8 +159,6 @@ install -p include/X11/extensions/XKBgeom.h $RPM_BUILD_ROOT%{_includedir}/X11/ex %{_includedir}/X11/extensions/xf86dgaconst.h %{_includedir}/X11/extensions/xf86dgaproto.h %{_includedir}/X11/extensions/xf86dgastr.h -%{_includedir}/X11/extensions/xf86misc.h -%{_includedir}/X11/extensions/xf86mscstr.h %{_includedir}/X11/extensions/xf86vm.h %{_includedir}/X11/extensions/xf86vmproto.h %{_includedir}/X11/extensions/xf86vmstr.h @@ -181,6 +168,7 @@ install -p include/X11/extensions/XKBgeom.h $RPM_BUILD_ROOT%{_includedir}/X11/ex %{_includedir}/X11/extensions/xtestext1const.h %{_includedir}/X11/extensions/xtestext1proto.h %{_includedir}/X11/extensions/xtestproto.h +%{_includedir}/X11/extensions/xwaylandproto.h %dir %{_includedir}/X11/fonts %{_includedir}/X11/fonts/FS.h %{_includedir}/X11/fonts/FSproto.h @@ -214,18 +202,85 @@ install -p include/X11/extensions/XKBgeom.h $RPM_BUILD_ROOT%{_includedir}/X11/ex %{_datadir}/pkgconfig/xf86bigfontproto.pc %{_datadir}/pkgconfig/xf86dgaproto.pc %{_datadir}/pkgconfig/xf86driproto.pc -%{_datadir}/pkgconfig/xf86miscproto.pc %{_datadir}/pkgconfig/xf86vidmodeproto.pc %{_datadir}/pkgconfig/xineramaproto.pc %{_datadir}/pkgconfig/xproto.pc +%{_datadir}/pkgconfig/xwaylandproto.pc %{_docdir}/xorgproto/* %changelog -* Mon Jun 08 2020 Peter Hutterer 2020.1-3 -- Ship XKBgeom.h from this package until libX11 is rebased +* Tue Oct 29 2024 Troy Dawson - 2024.1-3 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 -* Tue Jun 02 2020 Adam Jackson - 2020.1-2 -- xorgproto 2020.1 +* Mon Jun 24 2024 Troy Dawson - 2024.1-2 +- Bump release for June 2024 mass rebuild + +* Tue Apr 30 2024 Olivier Fourdan - 2024.1-1 +- xorgproto 2024.1 + +* Sat Jan 27 2024 Fedora Release Engineering - 2023.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Sep 07 2023 José Expósito - 2023.2-3 +- SPDX Migration + +* Sat Jul 22 2023 Fedora Release Engineering - 2023.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 16 2023 Olivier Fourdan - 2023.2-1 +- xorgproto 2023.2 + +* Mon Jun 5 2023 Olivier Fourdan - 2023.1-1 +- xorgproto 2023.1 + +* Sat Jan 21 2023 Fedora Release Engineering - 2022.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Aug 11 2022 Peter Hutterer - 2022.2-2 +- xorgproto 2022.2 + +* Sat Jul 23 2022 Fedora Release Engineering - 2022.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Apr 21 2022 Peter Hutterer - 2022.1-1 +- xorgproto 2022.1 + +* Sat Jan 22 2022 Fedora Release Engineering - 2021.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Sep 16 2021 Peter Hutterer - 2021.5-1 +- xorgproto 2021.5 + +* Fri Jul 23 2021 Fedora Release Engineering - 2021.4.99.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Adam Jackson - 2021.4.99.2-1 +- Prerelease for inputproto snapshot + +* Wed Jun 02 2021 Adam Jackson - 2021.4-2 +- Build with meson not autotools + +* Fri Apr 30 2021 Peter Hutterer 2021.4-1 +- xorgproto 2021.4 with XFixes 6 + +* Thu Feb 25 2021 Peter Hutterer 2021.3-1 +- xorgproto 2021.3 (no changes except the tarball no longer fails with meson) +- clean up the gitignore file + +* Wed Feb 24 2021 Peter Hutterer 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 - 2019.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Nov 5 10:26:38 AEST 2020 Peter Hutterer - 2019.1-5 +- Add BuildRequires for make + +* Wed Jul 29 2020 Fedora Release Engineering - 2019.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild * Fri Jan 31 2020 Fedora Release Engineering - 2019.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild