.gitignore

@@ -1,8 +1,9 @@
+SOURCES/edid-decode-dcc8b834.tar.xz
 SOURCES/xdpyinfo-1.3.2.tar.bz2
-SOURCES/xev-1.2.4.tar.bz2
+SOURCES/xev-1.2.2.tar.bz2
 SOURCES/xlsatoms-1.1.2.tar.bz2
 SOURCES/xlsclients-1.1.4.tar.bz2
 SOURCES/xlsfonts-1.0.6.tar.bz2
 SOURCES/xprop-1.2.3.tar.bz2
 SOURCES/xvinfo-1.1.3.tar.bz2
-SOURCES/xwininfo-1.1.5.tar.bz2
+SOURCES/xwininfo-1.1.4.tar.bz2

.xorg-x11-utils.metadata

@@ -1,8 +1,9 @@
+9827357814c85a78a78272d3a48bee0cb4dd48aa SOURCES/edid-decode-dcc8b834.tar.xz
 0922fc31f8fc82ac20e326a6c9eb33ed7d57ad87 SOURCES/xdpyinfo-1.3.2.tar.bz2
-76d182ba0f57449fbc7a7a467dfb7f1df767b873 SOURCES/xev-1.2.4.tar.bz2
+e737bc46c58b9bb10f0af9883dce203bbed708aa SOURCES/xev-1.2.2.tar.bz2
 0946410a2cd02b0dee7809fd75be090fb3961e9c SOURCES/xlsatoms-1.1.2.tar.bz2
 175af1c216a1db3de5023ecd6cce186e7693c6e4 SOURCES/xlsclients-1.1.4.tar.bz2
 bf95e46e0897dcb9d197ce20d4fa024b8ace5148 SOURCES/xlsfonts-1.0.6.tar.bz2
 77062c08a23cfca76824b7e8f9860678255d6b1a SOURCES/xprop-1.2.3.tar.bz2
 08ff744f7735317fd2fe1b0d2feba8c34cc2e5eb SOURCES/xvinfo-1.1.3.tar.bz2
-9f67b1eb07c5824d437bf577cf6198962af1aeb7 SOURCES/xwininfo-1.1.5.tar.bz2
+7364e79d1de7bb612dd98c336c649648c6c081ca SOURCES/xwininfo-1.1.4.tar.bz2

SOURCES/edid-decode-snapshot.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+git clone git://git.freedesktop.org/git/xorg/app/edid-decode
+cd edid-decode
+
+REVISION=$(git log | head -n1 | awk '{print $2}' | cut -c 1-8)
+
+rm -fr .git
+cd ..
+tar -cJf edid-decode-${REVISION}.tar.xz edid-decode
+rm -fr edid-decode

SPECS/xorg-x11-utils.spec

@@ -1,17 +1,17 @@
 # Component versions
 %global xdpyinfo 1.3.2
-%global xev 1.2.4
+%global xev 1.2.2
 %global xlsatoms 1.1.2
 %global xlsclients 1.1.4
 %global xlsfonts 1.0.6
 %global xprop 1.2.3
 %global xvinfo 1.1.3
-%global xwininfo 1.1.5
+%global xwininfo 1.1.4
 
 Summary:    X.Org X11 X client utilities
 Name:       xorg-x11-utils
 Version:    7.5
-Release:    40%{?dist}
+Release:    28%{?dist}
 License:    MIT
 URL:        http://www.x.org
 
@@ -24,7 +24,10 @@ Source5:    https://www.x.org/pub/individual/app/xprop-%{xprop}.tar.bz2
 Source6:    https://www.x.org/pub/individual/app/xvinfo-%{xvinfo}.tar.bz2
 Source7:    https://www.x.org/pub/individual/app/xwininfo-%{xwininfo}.tar.bz2
 
-BuildRequires:  make
+# No release tarball
+Source100:  edid-decode-dcc8b834.tar.xz
+Source101:  edid-decode-snapshot.sh
+
 BuildRequires:  gettext-devel
 BuildRequires:  libtool
 
@@ -40,8 +43,10 @@ BuildRequires:  pkgconfig(xrandr) >= 1.2
 BuildRequires:  pkgconfig(xtst)
 BuildRequires:  pkgconfig(xv)
 BuildRequires:  pkgconfig(xxf86dga)
+BuildRequires:  pkgconfig(xxf86misc)
 BuildRequires:  pkgconfig(xxf86vm)
 
+Provides:   edid-decode
 Provides:   xdpyinfo = %{xdpyinfo}
 Provides:   xev = %{xev}
 Provides:   xlsatoms = %{xlsatoms}
@@ -56,7 +61,7 @@ A collection of client utilities which can be used to query the X server for
 various information.
 
 %prep
-%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7
+%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a100
 
 %build
 # Build all apps
@@ -86,6 +91,7 @@ various information.
 }
 
 %files
+%{_bindir}/edid-decode
 %{_bindir}/xdpyinfo
 %{_bindir}/xev
 %{_bindir}/xlsatoms
@@ -94,6 +100,7 @@ various information.
 %{_bindir}/xprop
 %{_bindir}/xvinfo
 %{_bindir}/xwininfo
+%{_mandir}/man1/edid-decode.1*
 %{_mandir}/man1/xdpyinfo.1*
 %{_mandir}/man1/xev.1*
 %{_mandir}/man1/xlsatoms.1*
@@ -104,50 +111,6 @@ various information.
 %{_mandir}/man1/xwininfo.1*
 
 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 7.5-40
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Thu Apr 29 2021 Peter Hutterer <peter.hutterer@redhat.com> 7.5-39
-- Drop Provides for edid-decode, was removed in 7.7-33 (#1954354)
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 7.5-38
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-37
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Nov  5 10:40:41 AEST 2020 Peter Hutterer <peter.hutterer@redhat.com> - 7.5-36
-- Add BuildRequires for make
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-35
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 20 2020 Peter Hutterer <peter.hutterer@redhat.com> 7.5-34
-- xev 1.2.4
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Sep 26 2019 Adam Jackson <ajax@redhat.com> - 7.5-33
-- Drop edid-decode since upstream has moved away from X.org
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jul 16 2019 Adam Jackson <ajax@redhat.com> - 7.5-32
-- xwininfo 1.1.5
-
-* Thu Jun 20 2019 Adam Jackson <ajax@redhat.com> - 7.5-31
-- Drop BuildRequires: pkgconfig(xxf86misc), X servers haven't implemented that
-  extension in 10+ years.
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.5-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Mon Mar 12 2018 Adam Jackson <ajax@redhat.com> - 7.5-28
 - xlsclients 1.1.4
 - xlsfonts 1.0.6