rpms/xorg-x11-server-utils/devel xorg-x11-server-utils.spec, 1.40, 1.41

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27415

Modified Files:
	xorg-x11-server-utils.spec 
Log Message:
* Fri Feb 13 2009 Adam Jackson <ajax at redhat.com> 7.4-5
- Split xkeystone into a subpackage for nickle dependency.  Also, don't build
  it by default, since we don't have the cairo bindings packaged yet.



Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xorg-x11-server-utils.spec	4 Feb 2009 21:50:49 -0000	1.40
+++ xorg-x11-server-utils.spec	13 Feb 2009 20:02:19 -0000	1.41
@@ -1,9 +1,11 @@
 %define pkgname server-utils
+# doesn't work yet, needs more nickle bindings
+%define with_xkeystone 0
 
 Summary: X.Org X11 X server 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
@@ -82,6 +84,16 @@
 A collection of utilities used to tweak and query the runtime configuration
 of the X server.
 
+%if %{with_xkeystone}
+%package -n xkeystone
+Summary: X display keystone correction
+Group: User Interface/X
+Requires: nickle
+
+%description -n xkeystone
+Utility to perform keystone adjustments on X screens.
+%endif
+
 %prep
 %setup -q -c %{name}-%{version} -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16
 
@@ -142,6 +154,9 @@
       popd
    done
 }
+%if !%{with_xkeystone}
+rm -f $RPM_BUILD_ROOT/usr/bin/xkeystone
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -155,7 +170,6 @@
 %{_bindir}/xcmsdb
 %{_bindir}/xgamma
 %{_bindir}/xhost
-%{_bindir}/xkeystone
 %{_bindir}/xmodmap
 %{_bindir}/xrandr
 %{_bindir}/xrdb
@@ -186,7 +200,16 @@
 %{_mandir}/man1/xstdcmap.1*
 %{_mandir}/man1/xvidtune.1*
 
+%if %{with_xkeystone}
+%files -n xkeystone
+%{_bindir}/xkeystone
+%endif
+
 %changelog
+* Fri Feb 13 2009 Adam Jackson <ajax at redhat.com> 7.4-5
+- Split xkeystone into a subpackage for nickle dependency.  Also, don't build
+  it by default, since we don't have the cairo bindings packaged yet.
+
 * Wed Feb 04 2009 Adam Jackson <ajax at redhat.com> 7.4-4
 - xrandr 1.2.99.4