From a80496bfb7a5fe3885af3279b1ecc863d9b62898 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Jul 02 2009 20:16:58 +0000
Subject: - Drop xfd and xfontsel, move them to -apps to isolate libXaw deps.


---

diff --git a/sources b/sources
index edb6ce3..7fe3594 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,4 @@
 e3008eb0655da3026c162a5597d70869  xev-1.0.2.tar.bz2
-c72abd90f50ef459bc14b39ec9fcc7f8  xfd-1.0.1.tar.bz2
-288fe4cf8a990e4e602aac16dd9109fb  xfontsel-1.0.2.tar.bz2
 69adcda848479acc3b82b3928812d191  xlsatoms-1.0.1.tar.bz2
 44473b880d26bfbe8b3d4d72b183cba7  xlsclients-1.0.1.tar.bz2
 28958248590ff60ecd70e8f590d977b7  xlsfonts-1.0.2.tar.bz2
diff --git a/xorg-x11-utils.spec b/xorg-x11-utils.spec
index 3c5c39f..9e1ed8f 100644
--- a/xorg-x11-utils.spec
+++ b/xorg-x11-utils.spec
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X client utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -12,8 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:  ftp://ftp.x.org/pub/individual/app/xdpyinfo-1.0.3.tar.bz2
 #Source1:  ftp://ftp.x.org/pub/individual/app/xdriinfo-1.0.2.tar.bz2
 Source2:  ftp://ftp.x.org/pub/individual/app/xev-1.0.2.tar.bz2
-Source3:  ftp://ftp.x.org/pub/individual/app/xfd-1.0.1.tar.bz2
-Source4:  ftp://ftp.x.org/pub/individual/app/xfontsel-1.0.2.tar.bz2
 Source5:  ftp://ftp.x.org/pub/individual/app/xlsatoms-1.0.1.tar.bz2
 Source6:  ftp://ftp.x.org/pub/individual/app/xlsclients-1.0.1.tar.bz2
 Source7:  ftp://ftp.x.org/pub/individual/app/xlsfonts-1.0.2.tar.bz2
@@ -24,7 +22,6 @@ Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.4.tar.bz2
 BuildRequires: pkgconfig
 BuildRequires: libdmx-devel
 BuildRequires: libGL-devel
-BuildRequires: libXaw-devel
 BuildRequires: libXext-devel
 BuildRequires: libXft-devel
 BuildRequires: libXi-devel
@@ -37,14 +34,14 @@ BuildRequires: libXxf86dga-devel
 BuildRequires: libXxf86misc-devel
 BuildRequires: libXxf86vm-devel
 
-Provides: xdpyinfo xev xfd xfontsel xlsatoms xlsclients xlsfonts xprop xvinfo xwininfo
+Provides: xdpyinfo xev xlsatoms xlsclients xlsfonts xprop xvinfo xwininfo
 
 %description
 A collection of client utilities which can be used to query the X server
-for various information, view and select fonts, etc.
+for various information.
 
 %prep
-%setup -q -c %{name}-%{version} -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10
+%setup -q -c %{name}-%{version} -a2 -a5 -a6 -a7 -a8 -a9 -a10
 
 %build
 # Build all apps
@@ -76,21 +73,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc
 %{_bindir}/xdpyinfo
 %{_bindir}/xev
-%{_bindir}/xfd
-%{_bindir}/xfontsel
 %{_bindir}/xlsatoms
 %{_bindir}/xlsclients
 %{_bindir}/xlsfonts
 %{_bindir}/xprop
 %{_bindir}/xvinfo
 %{_bindir}/xwininfo
-%dir %{_datadir}/X11
-%{_datadir}/X11/app-defaults/XFontSel
-%{_datadir}/X11/app-defaults/Xfd
 %{_mandir}/man1/xdpyinfo.1*
 %{_mandir}/man1/xev.1*
-%{_mandir}/man1/xfd.1*
-%{_mandir}/man1/xfontsel.1*
 %{_mandir}/man1/xlsatoms.1*
 %{_mandir}/man1/xlsclients.1*
 %{_mandir}/man1/xlsfonts.1*
@@ -99,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xwininfo.1*
 
 %changelog
+* Thu Jul 02 2009 Adam Jackson <ajax@redhat.com> 7.4-5
+- Drop xfd and xfontsel, move them to -apps to isolate libXaw deps.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild