rpms/xorg-x11-utils/OLPC-3 xorg-x11-utils.spec,1.23,1.24

[Daniel Drake (dsd)]

Author: dsd

Update of /cvs/pkgs/rpms/xorg-x11-utils/OLPC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7647

Modified Files:
	xorg-x11-utils.spec 
Log Message:
remove xdriinfo to kill off mesa dependencies


Index: xorg-x11-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-utils/OLPC-3/xorg-x11-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xorg-x11-utils.spec	2 Jul 2008 18:50:06 -0000	1.23
+++ xorg-x11-utils.spec	24 Jul 2008 22:08:36 -0000	1.24
@@ -1,16 +1,17 @@
+%define minimal_build 1
 %define pkgname utils
 
 Summary: X.Org X11 X client utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 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
+Source1:  ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.4.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
@@ -19,11 +20,13 @@
 Source7:  ftp://ftp.x.org/pub/individual/app/xlsfonts-1.0.2.tar.bz2
 Source8:  ftp://ftp.x.org/pub/individual/app/xprop-1.0.4.tar.bz2
 Source9:  ftp://ftp.x.org/pub/individual/app/xvinfo-1.0.2.tar.bz2
-Source10: ftp://ftp.x.org/pub/individual/app/xwininfo-1.0.4.tar.bz2
+
+%if %{minimal_build} == 0
+Source10: ftp://ftp.x.org/pub/individual/app/xdriinfo-1.0.2.tar.bz2
+%endif
 
 BuildRequires: pkgconfig
 BuildRequires: libdmx-devel
-BuildRequires: libGL-devel
 BuildRequires: libXaw-devel
 BuildRequires: libXext-devel
 BuildRequires: libXft-devel
@@ -37,14 +40,25 @@
 BuildRequires: libXxf86misc-devel
 BuildRequires: libXxf86vm-devel
 
-Provides: xdpyinfo xdriinfo xev xfd xfontsel xlsatoms xlsclients xlsfonts xprop xvinfo xwininfo
+%if %{minimal_build} == 0
+BuildRequires: libGL-devel
+%endif
+
+Provides: xdpyinfo xev xfd xfontsel xlsatoms xlsclients xlsfonts xprop xvinfo xwininfo
+%if %{minimal_build} == 0
+Provides: xdriinfo
+%endif
 
 %description
 A collection of client utilities which can be used to query the X server
 for various information, view and select fonts, etc.
 
 %prep
+%if %{minimal_build} == 0
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10
+%else
+%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9
+%endif
 
 %build
 # Build all apps
@@ -75,7 +89,6 @@
 %defattr(-,root,root,-)
 %doc
 %{_bindir}/xdpyinfo
-%{_bindir}/xdriinfo
 %{_bindir}/xev
 %{_bindir}/xfd
 %{_bindir}/xfontsel
@@ -89,7 +102,6 @@
 %{_datadir}/X11/app-defaults/XFontSel
 %{_datadir}/X11/app-defaults/Xfd
 %{_mandir}/man1/xdpyinfo.1*
-%{_mandir}/man1/xdriinfo.1*
 %{_mandir}/man1/xev.1*
 %{_mandir}/man1/xfd.1*
 %{_mandir}/man1/xfontsel.1*
@@ -100,7 +112,15 @@
 %{_mandir}/man1/xvinfo.1*
 %{_mandir}/man1/xwininfo.1*
 
+%if %{minimal_build} == 0
+%{_bindir}/xdriinfo
+%{_mandir}/man1/xdriinfo.1*
+%endif
+
 %changelog
+* Thu Jul 24 2008 Daniel Drake <dsd at laptop.org> 7.4-2
+- Add OLPC-3 branch with fewer dependencies
+
 * Wed Jul 02 2008 Adam Jackson <ajax at redhat.com> 7.4-1
 - xdpyinfo 1.0.3
 - xprop 1.0.4