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

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-server-utils.spec 
Log Message:
* Sat Feb 21 2009 Adam Jackson <ajax at redhat.com> 7.4-6
- Merge review cleanups. (#226644)



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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xorg-x11-server-utils.spec	13 Feb 2009 20:02:19 -0000	1.41
+++ xorg-x11-server-utils.spec	21 Feb 2009 22:14:02 -0000	1.42
@@ -5,7 +5,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -74,12 +74,6 @@
 Provides: xmodmap xrandr xrdb xrefresh xset xsetmode xsetpointer
 Provides: xsetroot xstdcmap xvidtune
 
-# NOTE: iceauth, rgb, sessreg, xcmsdb, xgamma, xhost, xmodmap,
-# xrandr, xrdb, xrefresh, xset, xsetmode, xsetpointer, xsetroot, xstdcmap,
-# xvidtune, were all in xorg-x11 and XFree86 packages, so we obsolete
-# them to ensure upgrades work.
-Obsoletes: xorg-x11, XFree86
-
 %description
 A collection of utilities used to tweak and query the runtime configuration
 of the X server.
@@ -202,10 +196,14 @@
 
 %if %{with_xkeystone}
 %files -n xkeystone
+%defattr(-,root,root,-)
 %{_bindir}/xkeystone
 %endif
 
 %changelog
+* Sat Feb 21 2009 Adam Jackson <ajax at redhat.com> 7.4-6
+- Merge review cleanups. (#226644)
+
 * 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.