Prune obsolete/unused apps (#1952767)

Resolves: rhbz#1952767

sources

@@ -1,19 +1,9 @@
 SHA512 (luit-1.1.1.tar.bz2) = e834e89fca9987f6d82701f53d3c450cc64b93a804b11465b4a7ec5cb3a5c4ef30115df57dec3cbdbafa46e4a4f1bb4759b723123e2ff2f6b1c12207015638e6
-SHA512 (oclock-1.0.4.tar.bz2) = 6e0d36a84572a153226b2929f2253cb7adc3c9e5e3af168aeaf8c487ade2e43517b271a8e9cdb2a2c4a67ca56ed0b99c194ca63a4a822b68bfc72ca6518335e7
 SHA512 (x11perf-1.6.0.tar.bz2) = a9508c9dd6db2663b5bd30f5e1f5f80b1d22ce5221ae3dc292e746f8e554fda2d3130f7311f2545e20244dceb51e867fe80fec82c9ac5911dcdc90a73b231623
-SHA512 (xbiff-1.0.4.tar.bz2) = 0fb920a08640ec59f23d8a8a47bd244565dfbaff7a21c38a8a2abe1edb5eacabc970b5dbdc409163fc444fde5b75a2dc4e0114312938efec5b77228f3bf785ac
-SHA512 (xclipboard-1.1.3.tar.bz2) = 84a51d11851756422eb23e67b2721d2bcb2ac248fa32c0837423b6169144dff76717c22611ad3c93633e09a44dc70c847a2470d3988eff0b24d77e252a4e147e
 SHA512 (xclock-1.0.9.tar.bz2) = fcbac0b4ab1cea4ae0751ce1c0c6302048e5d98d459873c7580e4ca786ec49fa27f73e5831bdfe135abb5cfeabe886456276e9d01351ea7905c606f40f84522d
-SHA512 (xconsole-1.0.6.tar.bz2) = 115b3a03098ae3e06ba16af67afcd11c5a7906980ca04e8ec8ddd2c1dd4d02aab7a8952fd7f428861ad158052b9da8de11eab193de73e1f7264aca424e7cc620
 SHA512 (xcursorgen-1.0.6.tar.bz2) = 3b464b7be3cec8c6d2bf4538266108bdc09e1dae4053d573f7f38e004929b41be0d996aa54918490fa040655644e2b0d4fab1ec24cca014d77bdb91c41ab1db4
 SHA512 (xeyes-1.1.2.tar.bz2) = 008d76f03ddabd3d86ad9e52a540504553b94cb7a6743b20cf08897549eb27505667365ab9af21956a1b5ec7297acca8903a326536e6195a30e643cd93297ee0
 SHA512 (xfd-1.1.2.tar.bz2) = 3a158f697dd40c5b650b3d80ad1692d668d9d9bcf586a437fd3dcebf9e8fffb773855df290260995464d5f36cb22e768d1d71de8e61d7cca80eaa4d25c029745
-SHA512 (xfontsel-1.0.6.tar.bz2) = 2f6bc51549a302404cdaf9a5a825add383953fcbb2a0c7076691cefd4dd7e4a3c772c047be74101c8486f75d03ce0bd3e65ede14e91732cf2a932810441c9099
-SHA512 (xload-1.1.3.tar.bz2) = 8dbc4f0cee7b30d7381be819152b27653d9b0049266e59bde2e2c972a88c4f2bdea766fc407bbdfef15d0aab30fedc756189a1048170a812853133a5094fe7a5
-SHA512 (xlogo-1.0.4.tar.bz2) = cbfcd48425e697950907ddeaec2f06e0607ebf2e93e6799bd263230f036b3021279c2f379de55fae15b403af5f18292caa79159ed544a4a3314b90c85ac9804d
-SHA512 (xmag-1.0.6.tar.bz2) = 98f3c8e0c58f31cd4f1736ba9c5cd68dba3b2e2de6191988de8ae3e91b1d310803461840189ad56be45ee57c9ca05a2c63544a49b02ce6f79f2ebc14c59613de
 SHA512 (xmessage-1.0.5.tar.bz2) = a8423c3986b1576fa67800c315a605a527bb9a8f594ac269a736ae7b91eed0d4d83deb89148197dc3cd3f0e51894146958ce2979f78e97dcdb99c5326e34dabe
-SHA512 (xpr-1.0.5.tar.bz2) = d5dfb936ec4ad0067d02654dec8e862fe337ff6a2c2f974b2b3a612a829c2e728a0d51e7aba00ed2a94dc96dc50cc69f2c59f522e0635013f5f4f5bb3f4ab967
-SHA512 (xvidtune-1.0.3.tar.bz2) = 0f8a4fca1b544ef8f9623246fb0ece75739a0889f2e729c040cd768c595f0bbbfa3a665576369032535c34c7d55784a29b62f0d51432bf2b75d2cec619db7352
 SHA512 (xwd-1.0.7.tar.bz2) = 6fdb0a115ae505169bbc7fcc45580daf26bced2e26e0bf9a877636016038931a8386e8edcbe015f4024be508d0461906adef4834cf22a445e3c282f0b8fad17e
 SHA512 (xwud-1.0.5.tar.bz2) = 27a0ce7481978ae6cd94b0d94374af72185e270d68f2496620e148bb00945427c4827138d9efc48745e6382e3da3390ed0cdff7dbd02dcf9706e8ecccae97184

xorg-x11-apps.spec

@@ -1,50 +1,30 @@
 # Component versions
 %global luit 1.1.1
-%global oclock 1.0.4
 %global x11perf 1.6.0
-%global xbiff 1.0.4
-%global xclipboard 1.1.3
 %global xclock 1.0.9
-%global xconsole 1.0.6
 %global xcursorgen 1.0.6
 %global xeyes 1.1.2
 %global xfd 1.1.2
-%global xfontsel 1.0.6
-%global xload 1.1.3
-%global xlogo 1.0.4
-%global xmag 1.0.6
 %global xmessage 1.0.5
-%global xpr 1.0.5
-%global xvidtune 1.0.3
 %global xwd 1.0.7
 %global xwud 1.0.5
 
 Summary:    X.Org X11 applications
 Name:       xorg-x11-apps
 Version:    7.7
-Release:    30%{?dist}
+Release:    31%{?dist}
 License:    MIT
 URL:        https://www.x.org
 
 Source0:    https://www.x.org/pub/individual/app/luit-%{luit}.tar.bz2
-Source1:    https://www.x.org/pub/individual/app/oclock-%{oclock}.tar.bz2
+Source1:    https://www.x.org/pub/individual/app/x11perf-%{x11perf}.tar.bz2
-Source2:    https://www.x.org/pub/individual/app/x11perf-%{x11perf}.tar.bz2
+Source2:    https://www.x.org/pub/individual/app/xclock-%{xclock}.tar.bz2
-Source3:    https://www.x.org/pub/individual/app/xbiff-%{xbiff}.tar.bz2
+Source3:    https://www.x.org/pub/individual/app/xcursorgen-%{xcursorgen}.tar.bz2
-Source4:    https://www.x.org/pub/individual/app/xclipboard-%{xclipboard}.tar.bz2
+Source4:    https://www.x.org/pub/individual/app/xeyes-%{xeyes}.tar.bz2
-Source5:    https://www.x.org/pub/individual/app/xclock-%{xclock}.tar.bz2
+Source5:    https://www.x.org/pub/individual/app/xfd-%{xfd}.tar.bz2
-Source6:    https://www.x.org/pub/individual/app/xconsole-%{xconsole}.tar.bz2
+Source6:    https://www.x.org/pub/individual/app/xmessage-%{xmessage}.tar.bz2
-Source7:    https://www.x.org/pub/individual/app/xcursorgen-%{xcursorgen}.tar.bz2
+Source7:    https://www.x.org/pub/individual/app/xwd-%{xwd}.tar.bz2
-Source8:    https://www.x.org/pub/individual/app/xeyes-%{xeyes}.tar.bz2
+Source8:    https://www.x.org/pub/individual/app/xwud-%{xwud}.tar.bz2
-Source9:    https://www.x.org/pub/individual/app/xfd-%{xfd}.tar.bz2
-Source10:   https://www.x.org/pub/individual/app/xfontsel-%{xfontsel}.tar.bz2
-Source11:   https://www.x.org/pub/individual/app/xload-%{xload}.tar.bz2
-Source12:   https://www.x.org/pub/individual/app/xlogo-%{xlogo}.tar.bz2
-Source13:   https://www.x.org/pub/individual/app/xmag-%{xmag}.tar.bz2
-Source14:   https://www.x.org/pub/individual/app/xmessage-%{xmessage}.tar.bz2
-Source15:   https://www.x.org/pub/individual/app/xpr-%{xpr}.tar.bz2
-Source16:   https://www.x.org/pub/individual/app/xvidtune-%{xvidtune}.tar.bz2
-Source17:   https://www.x.org/pub/individual/app/xwd-%{xwd}.tar.bz2
-Source18:   https://www.x.org/pub/individual/app/xwud-%{xwud}.tar.bz2
 
 Patch0:     x11perf-1.6.0-x11perf-datadir-cleanups.patch
 Patch1:     luit-1.1.1-configure-define-XOPEN_SOURCE-to-600-on-linux.patch
@@ -56,7 +36,6 @@ BuildRequires:  pkgconfig(fontenc)
 BuildRequires:  pkgconfig(libpng) >= 1.2
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xaw7)
-BuildRequires:  pkgconfig(xbitmaps)
 BuildRequires:  pkgconfig(xcursor)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xft)
@@ -64,32 +43,18 @@ BuildRequires:  pkgconfig(xkbfile)
 BuildRequires:  pkgconfig(xmu)
 BuildRequires:  pkgconfig(xrender) >= 0.4
 BuildRequires:  pkgconfig(xt) >= 1.1
-BuildRequires:  pkgconfig(xxf86vm)
 BuildRequires:  pkgconfig(xorg-macros) >= 1.8
 
-# xbiff requires xbitmaps (#474258)
-Requires:   xorg-x11-xbitmaps
-
 # luit requires the encodings from xorg-x11-fonts-misc (rhbz#1046341)
 Requires:   xorg-x11-fonts-misc
 
 Provides:   luit = %{luit}
-Provides:   oclock = %{oclock}
 Provides:   x11perf = %{x11perf}
-Provides:   xbiff = %{xbiff}
-Provides:   xclipboard = %{xclipboard}
 Provides:   xclock = %{xclock}
-Provides:   xconsole = %{xconsole}
 Provides:   xcursorgen = %{xcursorgen}
 Provides:   xeyes = %{xeyes}
 Provides:   xfd = %{xfd}
-Provides:   xfontsel = %{xfontsel}
-Provides:   xload = %{xload}
-Provides:   xlogo = %{xlogo}
-Provides:   xmag = %{xmag}
 Provides:   xmessage = %{xmessage}
-Provides:   xpr = %{xpr}
-Provides:   xvidtune = %{xvidtune}
 Provides:   xwd = %{xwd}
 Provides:   xwud = %{xwud}
 
@@ -97,7 +62,7 @@ Provides:   xwud = %{xwud}
 A collection of common X Window System applications.
 
 %prep
-%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18
+%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8
 %patch0 -p0 -b .x11perf-datadir-cleanup
 %patch1 -p0 -b .luit-xopen_source
 
@@ -125,67 +90,37 @@ done
 
 %files
 %{_bindir}/luit
-%{_bindir}/oclock
 %{_bindir}/x11perf
 %{_bindir}/x11perfcomp
-%{_bindir}/xbiff
-%{_bindir}/xclipboard
 %{_bindir}/xclock
-%{_bindir}/xconsole
 %{_bindir}/xcursorgen
-%{_bindir}/xcutsel
-%{_bindir}/xdpr
 %{_bindir}/xeyes
 %{_bindir}/xfd
-%{_bindir}/xfontsel
-%{_bindir}/xload
-%{_bindir}/xlogo
-%{_bindir}/xmag
 %{_bindir}/xmessage
-%{_bindir}/xpr
-%{_bindir}/xvidtune
 %{_bindir}/xwd
 %{_bindir}/xwud
-%{_datadir}/X11/app-defaults/Clock-color
-%{_datadir}/X11/app-defaults/XClipboard
 %{_datadir}/X11/app-defaults/XClock
 %{_datadir}/X11/app-defaults/XClock-color
-%{_datadir}/X11/app-defaults/XConsole
 %{_datadir}/X11/app-defaults/Xfd
-%{_datadir}/X11/app-defaults/XFontSel
-%{_datadir}/X11/app-defaults/XLoad
-%{_datadir}/X11/app-defaults/XLogo
-%{_datadir}/X11/app-defaults/XLogo-color
-%{_datadir}/X11/app-defaults/Xmag
 %{_datadir}/X11/app-defaults/Xmessage
 %{_datadir}/X11/app-defaults/Xmessage-color
-%{_datadir}/X11/app-defaults/Xvidtune
 %{_datadir}/X11/x11perfcomp
 %{_mandir}/man1/luit.1*
-%{_mandir}/man1/oclock.1*
 %{_mandir}/man1/x11perf.1*
 %{_mandir}/man1/x11perfcomp.1*
-%{_mandir}/man1/xbiff.1*
-%{_mandir}/man1/xclipboard.1*
 %{_mandir}/man1/xclock.1*
-%{_mandir}/man1/xconsole.1*
 %{_mandir}/man1/xcursorgen.1*
-%{_mandir}/man1/xcutsel.1*
-%{_mandir}/man1/xdpr.1*
 %{_mandir}/man1/xeyes.1*
 %{_mandir}/man1/xfd.1*
-%{_mandir}/man1/xfontsel.1*
-%{_mandir}/man1/xload.1*
-%{_mandir}/man1/xlogo.1*
-%{_mandir}/man1/xmag.1*
 %{_mandir}/man1/Xmark.1*
 %{_mandir}/man1/xmessage.1*
-%{_mandir}/man1/xpr.1*
-%{_mandir}/man1/xvidtune.1*
 %{_mandir}/man1/xwd.1*
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Thu Apr 29 2021 Peter Hutterer <peter.hutterer@redhat.com> 7.7-31
+- Prune obsolete/unused apps (#1952767)
+
 * Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-30
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild