rpms/xkeyboard-config/devel xkeyboard-config.spec,1.42,1.43

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xkeyboard-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14049

Modified Files:
	xkeyboard-config.spec 
Log Message:
* Fri Jan 08 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7-3
- Remove xkbdata provides. The xkbdata provides was introduced when
  xorg-x11-drv-xkbdata moved to xkeyboard-config. It's purpose was mainly to
  protect against future renamings of this module which is unlikely to
  happen anytime soon.



Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- xkeyboard-config.spec	6 Jan 2010 03:19:17 -0000	1.42
+++ xkeyboard-config.spec	8 Jan 2010 00:02:46 -0000	1.43
@@ -4,7 +4,7 @@
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
 Version: 1.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -22,20 +22,6 @@ BuildRequires: intltool
 BuildRequires: gettext
 BuildRequires: git-core
 
-# NOTE: Any packages that need xkbdata to be installed should be using
-# the following "Requires: xkbdata" virtual provide, and not directly depending
-# on the specific package name that the data is part of.  This ensures
-# futureproofing of packaging in the event the package name changes, which
-# has happened often.
-Provides: xkbdata = %{version}-%{release}
-# NOTE: We obsolete xorg-x11-xkbdata but currently intentionally do not
-# virtual-provide it.  The idea is to find out which packages have a
-# dependency on xorg-x11-xkbdata currently and fix them to require "xkbdata"
-# instead.  Later, if this causes a problem, which seems unlikely, we can
-# add a virtual provide for the old package name for compatibility, but
-# hopefully everything is using the virtual name and we can avoid that.
-Obsoletes: xorg-x11-xkbdata < 1.0.1-9
-
 %description
 This package contains configuration data used by the X Keyboard Extension 
 (XKB), which allows selection of keyboard layouts when using a graphical 
@@ -92,6 +78,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Fri Jan 08 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7-3
+- Remove xkbdata provides. The xkbdata provides was introduced when
+  xorg-x11-drv-xkbdata moved to xkeyboard-config. It's purpose was mainly to
+  protect against future renamings of this module which is unlikely to
+  happen anytime soon.
+
 * Wed Jan 06 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7-2
 - Specify version for xkbdata provides and obsoletes. According to the
   changelog, the last xkbdata version was 1.0.1-8. Although xkeyboard-config