rpms/xorg-x11-server/devel xorg-x11-server.spec,1.418,1.419
Peter Hutterer
whot at fedoraproject.org
Wed Mar 4 22:52:21 UTC 2009
Author: whot
Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17343
Modified Files:
xorg-x11-server.spec
Log Message:
* Thu Mar 05 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.0-7
- Remove 10-x11-keymap.fdi, this is provided by fedora-setup-keyboard now.
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -r1.418 -r1.419
--- xorg-x11-server.spec 4 Mar 2009 21:25:58 -0000 1.418
+++ xorg-x11-server.spec 4 Mar 2009 22:51:51 -0000 1.419
@@ -19,7 +19,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.6.0
-Release: 6%{?dist}
+Release: 7%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -36,9 +36,6 @@
Source1: gitignore
%endif
-# keyboard enablement
-Source10: 10-x11-keymap.fdi
-
# "useful" xvfb-run script
Source20: http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh
@@ -338,9 +335,6 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/xorg
install -m 0444 hw/xfree86/common/{vesa,extra}modes $RPM_BUILD_ROOT%{_datadir}/xorg/
-# fedora-isms to slurp keyboard settings out of /etc/sysconfig/keyboard
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor
-install -m 0444 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor
%endif
# Make the source package
@@ -408,7 +402,6 @@
%{_bindir}/cvt
%{_bindir}/gtf
%dir %{_datadir}/xorg
-%{_datadir}/hal/fdi/policy/10osvendor/10-x11-keymap.fdi
%{_datadir}/xorg/vesamodes
%{_datadir}/xorg/extramodes
%dir %{_libdir}/xorg
@@ -507,6 +500,9 @@
%changelog
+* Thu Mar 05 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.0-7
+- Remove 10-x11-keymap.fdi, this is provided by fedora-setup-keyboard now.
+
* Wed Mar 04 2009 Adam Jackson <ajax at redhat.com> 1.6.0-6
- Move fedora-setup-keyboard (and libdrm) Requires to the Xorg subpackage,
since they won't do anything at the top level.
More information about the fedora-extras-commits
mailing list