Compare commits

...

No commits in common. "c9" and "c8" have entirely different histories.
c9 ... c8

3 changed files with 21 additions and 31 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/xorgproto-2024.1.tar.xz
SOURCES/xorgproto-2020.1.tar.bz2

View File

@ -1 +1 @@
49a078b1150463d0b633c6c75becf291b318a8c8 SOURCES/xorgproto-2024.1.tar.xz
1cdab4e9ab796760ddb9582071328469a8eca08a SOURCES/xorgproto-2020.1.tar.bz2

View File

@ -5,17 +5,16 @@
Summary: X.Org X11 Protocol headers
Name: xorg-x11-proto-devel
Version: 2024.1
Release: 1%{?dist}
Version: 2020.1
Release: 3%{?dist}
License: MIT
URL: https://www.x.org
BuildArch: noarch
Source0: https://www.x.org/pub/individual/proto/xorgproto-%{version}.tar.xz
Source0: https://www.x.org/pub/individual/proto/xorgproto-%{version}.tar.bz2
Source40: make-git-snapshot.sh
BuildRequires: make
BuildRequires: pkgconfig
BuildRequires: xorg-x11-util-macros >= 1.0.2-1
BuildRequires: autoconf automake libtool
@ -45,6 +44,14 @@ 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
@ -150,6 +157,7 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
%{_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
@ -162,6 +170,8 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
%{_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
@ -171,7 +181,6 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
%{_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
@ -205,37 +214,18 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
%{_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
* Thu May 16 2024 Olivier Fourdan <ofourdan@redhat.com> - 2024.1-1
- xorgproto 2024.1 (RHEL-36584)
* Mon Jun 08 2020 Peter Hutterer <peter.hutterer@redhat.com> 2020.1-3
- Ship XKBgeom.h from this package until libX11 is rebased
* Tue Mar 21 2023 Olivier Fourdan <ofourdan@redhat.com> - 2022.2-1
xorgproto 2022.2 (#2179319)
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2021.4-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 30 2021 Peter Hutterer <peter.hutterer@redhat.com> 2021.4-1
- xorgproto 2021.4 (#1954344)
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2019.1-7
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2019.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Nov 5 10:26:38 AEST 2020 Peter Hutterer <peter.hutterer@redhat.com> - 2019.1-5
- Add BuildRequires for make
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2019.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jun 02 2020 Adam Jackson <ajax@redhat.com> - 2020.1-2
- xorgproto 2020.1
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2019.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild