[xorg-x11-apps] Require xorg-x11-xbitmaps for xbiff (#474258)

[Peter Hutterer]

commit 178724124f280005e84e5a17c2b2cfed0c5271fe
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Jul 19 13:58:01 2013 +1000

    Require xorg-x11-xbitmaps for xbiff (#474258)
    
    - fix rpmlint complaints
    - update sources to http sources, ftp fails too often

 xorg-x11-apps.spec |   52 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 29 insertions(+), 23 deletions(-)
---
diff --git a/xorg-x11-apps.spec b/xorg-x11-apps.spec
index 1dacb0d..97037d8 100644
--- a/xorg-x11-apps.spec
+++ b/xorg-x11-apps.spec
@@ -5,33 +5,33 @@ Name: xorg-x11-%{pkgname}
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
 Version: 7.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 
 # Clock apps
-Source0:  ftp://ftp.x.org/pub/individual/app/oclock-1.0.3.tar.bz2
-Source1:  ftp://ftp.x.org/pub/individual/app/xclock-1.0.6.tar.bz2
+Source0:  http://xorg.freedesktop.org/archive/individual/app/oclock-1.0.3.tar.bz2
+Source1:  http://xorg.freedesktop.org/archive/individual/app/xclock-1.0.6.tar.bz2
 # X Window Dump (xwd) utilities
-Source2:  ftp://ftp.x.org/pub/individual/app/xwd-1.0.4.tar.bz2
-Source3:  ftp://ftp.x.org/pub/individual/app/xwud-1.0.3.tar.bz2
-Source4:  ftp://ftp.x.org/pub/individual/app/xpr-1.0.4.tar.bz2
+Source2:  http://xorg.freedesktop.org/archive/individual/app/xwd-1.0.4.tar.bz2
+Source3:  http://xorg.freedesktop.org/archive/individual/app/xwud-1.0.3.tar.bz2
+Source4:  http://xorg.freedesktop.org/archive/individual/app/xpr-1.0.4.tar.bz2
 # Miscellaneous other applications
-Source5:  ftp://ftp.x.org/pub/individual/app/luit-1.1.1.tar.bz2
-Source6:  ftp://ftp.x.org/pub/individual/app/x11perf-1.5.4.tar.bz2
-Source7:  ftp://ftp.x.org/pub/individual/app/xbiff-1.0.3.tar.bz2
-Source8:  ftp://ftp.x.org/pub/individual/app/xclipboard-1.1.2.tar.bz2
-Source9:  ftp://ftp.x.org/pub/individual/app/xconsole-1.0.5.tar.bz2
-Source10: ftp://ftp.x.org/pub/individual/app/xcursorgen-1.0.5.tar.bz2
-Source11: ftp://ftp.x.org/pub/individual/app/xeyes-1.1.1.tar.bz2
-Source13: ftp://ftp.x.org/pub/individual/app/xload-1.1.1.tar.bz2
-Source14: ftp://ftp.x.org/pub/individual/app/xlogo-1.0.4.tar.bz2
-Source15: ftp://ftp.x.org/pub/individual/app/xmag-1.0.5.tar.bz2
-Source16: ftp://ftp.x.org/pub/individual/app/xmessage-1.0.4.tar.bz2
-Source18: ftp://ftp.x.org/pub/individual/app/xfd-1.1.1.tar.bz2
-Source19: ftp://ftp.x.org/pub/individual/app/xfontsel-1.0.4.tar.bz2
-Source20: ftp://ftp.x.org/pub/individual/app/xvidtune-1.0.3.tar.bz2
+Source5:  http://xorg.freedesktop.org/archive/individual/app/luit-1.1.1.tar.bz2
+Source6:  http://xorg.freedesktop.org/archive/individual/app/x11perf-1.5.4.tar.bz2
+Source7:  http://xorg.freedesktop.org/archive/individual/app/xbiff-1.0.3.tar.bz2
+Source8:  http://xorg.freedesktop.org/archive/individual/app/xclipboard-1.1.2.tar.bz2
+Source9:  http://xorg.freedesktop.org/archive/individual/app/xconsole-1.0.5.tar.bz2
+Source10: http://xorg.freedesktop.org/archive/individual/app/xcursorgen-1.0.5.tar.bz2
+Source11: http://xorg.freedesktop.org/archive/individual/app/xeyes-1.1.1.tar.bz2
+Source13: http://xorg.freedesktop.org/archive/individual/app/xload-1.1.1.tar.bz2
+Source14: http://xorg.freedesktop.org/archive/individual/app/xlogo-1.0.4.tar.bz2
+Source15: http://xorg.freedesktop.org/archive/individual/app/xmag-1.0.5.tar.bz2
+Source16: http://xorg.freedesktop.org/archive/individual/app/xmessage-1.0.4.tar.bz2
+Source18: http://xorg.freedesktop.org/archive/individual/app/xfd-1.1.1.tar.bz2
+Source19: http://xorg.freedesktop.org/archive/individual/app/xfontsel-1.0.4.tar.bz2
+Source20: http://xorg.freedesktop.org/archive/individual/app/xvidtune-1.0.3.tar.bz2
 
 Patch0: x11perf-1.5.4-x11perf-datadir-cleanups.patch
 Patch7: luit-1.1.1-configure-define-XOPEN_SOURCE-to-600-on-linux.patch
@@ -59,6 +59,9 @@ BuildRequires: libXi-devel >= 1.2
 BuildRequires: libXxf86vm-devel
 BuildRequires: xorg-x11-xbitmaps
 
+# xbiff requires xbitmaps (#474258)
+Requires: xorg-x11-xbitmaps
+
 Provides: luit oclock x11perf xbiff xclipboard xclock xconsole xcursorgen
 Provides: xeyes xload xlogo xmag xmessage xpr xwd xwud
 Provides: xfd xfontsel xvidtune
@@ -108,7 +111,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-#%doc
 %{_bindir}/luit
 %{_bindir}/oclock
 %{_bindir}/x11perf
@@ -150,7 +152,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/x11perfcomp/fillblnk
 %{_datadir}/X11/x11perfcomp/perfboth
 %{_datadir}/X11/x11perfcomp/perfratio
-#%dir %{_mandir}/man1x
 %{_mandir}/man1/xcursorgen.1*
 %{_mandir}/man1/Xmark.1*
 %{_mandir}/man1/luit.1*
@@ -176,6 +177,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Fri Jul 19 2013 Peter Hutterer <peter.hutterer at redhat.com> 7.7-6
+- Require xorg-x11-xbitmaps for xbiff (#474258)
+- fix rpmlint complaints
+- update sources to http sources, ftp fails too often
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -392,7 +398,7 @@ rm -rf $RPM_BUILD_ROOT
   to put the helper scripts in datadir.
 - Added --disable-xprint to configure, as a great symbolic jesture.
 
-* Wed Nov 22 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-4
+* Tue Nov 22 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-4
 - Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-3" to workaround
   (#173384)
 - Added the following patches, and invoke aclocal/automake/autoconf on them