rpms/xorg-x11-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

* Wed Mar 04 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.0-5

Browse Source 
- Drop our own fedora-setup-keyboard script, Require: fedora-setup-keyboard
  package instead.
This commit is contained in:
Peter Hutterer 2009-03-04 01:14:57 +00:00
parent bf40c1dd9f
commit a7838734b2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xorg-x11-server.spec
View File

@ -19,7 +19,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.6.0 Version: 1.6.0
Release: 4%{?dist} Release: 5%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -38,7 +38,6 @@ Source1: gitignore
# keyboard enablement # keyboard enablement
Source10: 10-x11-keymap.fdi Source10: 10-x11-keymap.fdi
Source11: fedora-setup-keyboard
# "useful" xvfb-run script # "useful" xvfb-run script
Source20: http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh Source20: http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh
@ -147,6 +146,7 @@ BuildRequires: mesa-libGL-devel >= 7.1-0.37
BuildRequires: libdrm-devel >= 2.4.0 kernel-devel BuildRequires: libdrm-devel >= 2.4.0 kernel-devel
%if %{with_hw_servers} %if %{with_hw_servers}
Requires: libdrm >= 2.4.0 Requires: libdrm >= 2.4.0
Requires: fedora-setup-keyboard
%endif %endif
BuildRequires: audit-libs-devel libselinux-devel >= 2.0.59-1 BuildRequires: audit-libs-devel libselinux-devel >= 2.0.59-1
@ -347,7 +347,6 @@ install -m 0444 hw/xfree86/common/{vesa,extra}modes $RPM_BUILD_ROOT%{_datadir}/x
# fedora-isms to slurp keyboard settings out of /etc/sysconfig/keyboard # fedora-isms to slurp keyboard settings out of /etc/sysconfig/keyboard
mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor
install -m 0444 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor install -m 0444 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor
install -m 0755 %{SOURCE11} $RPM_BUILD_ROOT%{_bindir}
%endif %endif
# Make the source package # Make the source package
@ -413,7 +412,6 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/X %{_bindir}/X
%attr(4711, root, root) %{_bindir}/Xorg %attr(4711, root, root) %{_bindir}/Xorg
%{_bindir}/cvt %{_bindir}/cvt
%{_bindir}/fedora-setup-keyboard
%{_bindir}/gtf %{_bindir}/gtf
%dir %{_datadir}/xorg %dir %{_datadir}/xorg
%{_datadir}/hal/fdi/policy/10osvendor/10-x11-keymap.fdi %{_datadir}/hal/fdi/policy/10osvendor/10-x11-keymap.fdi
@ -515,6 +513,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed Mar 04 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.0-5
- Drop our own fedora-setup-keyboard script, Require: fedora-setup-keyboard
package instead.
* Tue Mar 03 2009 Adam Jackson <ajax@redhat.com> 1.6.0-4 * Tue Mar 03 2009 Adam Jackson <ajax@redhat.com> 1.6.0-4
- xserver-1.6.0-selinux-raw.patch: Deal in raw contexts, to avoid paying - xserver-1.6.0-selinux-raw.patch: Deal in raw contexts, to avoid paying
the price for setrans on every object. the price for setrans on every object.