rpms/xorg-x11-server/FC-6 xorg-x11-server.spec,1.182,1.183

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv9773

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Fri Dec 1 2006 Adam Jackson <ajax at redhat.com> 1.1.1-47.2.fc6
- xorg-x11-server-1.1.1-xkb-vidmode-switch.patch: Fix string matching on
  XKB actions to be case-insensitive again.  (#216656)



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/FC-6/xorg-x11-server.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- xorg-x11-server.spec	15 Nov 2006 16:28:29 -0000	1.182
+++ xorg-x11-server.spec	1 Dec 2006 20:48:58 -0000	1.183
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.1
-Release:   47.1%{?dist}
+Release:   47.2%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -26,6 +26,7 @@
 Patch10:   xorg-x11-server-1.1.1-vbe-filter-less.patch
 Patch11:   xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch
 Patch12:   xorg-x11-server-1.1.1-graphics-expose.patch
+Patch13:   xorg-x11-server-1.1.1-xkb-vidmode-switch.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
@@ -351,6 +352,7 @@
 %patch10 -p1 -b .vbe-filter
 %patch11 -p1 -b .vt-activate
 %patch12 -p1 -b .graphics-expose
+%patch13 -p1 -b .xkb-vidmode-switch
 
 %patch100 -p0 -b .no-move-damage
 %patch101 -p0 -b .dont-backfill-bg-none
@@ -474,8 +476,8 @@
     rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak
     rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcitweak.1*
 %endif
-    rm -f $RPM_BUILD_ROOT%{_mandir}/man1/getconfig.1x*
-    rm -f $RPM_BUILD_ROOT%{_mandir}/man5/getconfig.5x*
+    rm -f $RPM_BUILD_ROOT%{_mandir}/man1/getconfig.1*
+    rm -f $RPM_BUILD_ROOT%{_mandir}/man5/getconfig.5*
     # Remove all libtool archives (*.la)
     find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
 
@@ -638,18 +640,18 @@
 %{_libdir}/xserver/SecurityPolicy
 #%dir %{_mandir}/man1x
 %if %{with_developer_utils}
-%{_mandir}/man1/pcitweak.1x*
+%{_mandir}/man1/pcitweak.1*
 %endif
-%{_mandir}/man1/gtf.1x*
-%{_mandir}/man1/scanpci.1x*
-%{_mandir}/man1/Xorg.1x*
-%{_mandir}/man1/Xserver.1x*
+%{_mandir}/man1/gtf.1*
+%{_mandir}/man1/scanpci.1*
+%{_mandir}/man1/Xorg.1*
+%{_mandir}/man1/Xserver.1*
 %{_mandir}/man1/cvt.1*
 #%dir %{_mandir}/man4x
 #%{_mandir}/man4/fbdevhw.4x*
 %{_mandir}/man4/fbdevhw.4*
 #%dir %{_mandir}/man5x
-%{_mandir}/man5/xorg.conf.5x*
+%{_mandir}/man5/xorg.conf.5*
 %dir %{_localstatedir}/lib/xkb
 %{_localstatedir}/lib/xkb/README.compiled
 %endif
@@ -660,9 +662,9 @@
 %defattr(-,root,root,-)
 %{_bindir}/Xnest
 #%dir %{_mandir}/man1x
-%{_mandir}/man1/Xnest.1x*
+%{_mandir}/man1/Xnest.1*
 # NOTE: Xserver.1x intentionally present in multiple subpackages
-%{_mandir}/man1/Xserver.1x*
+%{_mandir}/man1/Xserver.1*
 
 # ----- Xdmx --------------------------------------------------------
 
@@ -682,12 +684,12 @@
 %{_bindir}/xdmx
 %{_bindir}/xdmxconfig
 #%dir %{_mandir}/man1x
-%{_mandir}/man1/Xdmx.1x*
-%{_mandir}/man1/dmxtodmx.1x*
-%{_mandir}/man1/vdltodmx.1x*
-%{_mandir}/man1/xdmxconfig.1x*
+%{_mandir}/man1/Xdmx.1*
+%{_mandir}/man1/dmxtodmx.1*
+%{_mandir}/man1/vdltodmx.1*
+%{_mandir}/man1/xdmxconfig.1*
 # NOTE: Xserver.1x intentionally present in multiple subpackages
-%{_mandir}/man1/Xserver.1x*
+%{_mandir}/man1/Xserver.1*
 %endif
 
 # ----- Xvfb --------------------------------------------------------
@@ -696,9 +698,9 @@
 %defattr(-,root,root,-)
 %{_bindir}/Xvfb
 #%dir %{_mandir}/man1x
-%{_mandir}/man1/Xvfb.1x*
+%{_mandir}/man1/Xvfb.1*
 # NOTE: Xserver.1x intentionally present in multiple subpackages
-%{_mandir}/man1/Xserver.1x*
+%{_mandir}/man1/Xserver.1*
 
 # ----- Xephyr -------------------------------------------------------
 
@@ -709,7 +711,7 @@
 #%dir %{_mandir}/man1x
 #%{_mandir}/man1/Xephyr.1x*
 # NOTE: Xserver.1x intentionally present in multiple subpackages
-%{_mandir}/man1/Xserver.1x*
+%{_mandir}/man1/Xserver.1*
 
 # ----- sdk ---------------------------------------------------------
 %if %{with_hw_servers}
@@ -726,6 +728,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Fri Dec 1 2006 Adam Jackson <ajax at redhat.com> 1.1.1-47.2.fc6
+- xorg-x11-server-1.1.1-xkb-vidmode-switch.patch: Fix string matching on
+  XKB actions to be case-insensitive again.  (#216656)
+
 * Wed Nov 15 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-47.1.fc6
 - xorg-x11-server-1.1.1-int10-muxing.patch: Build both the vm86 and x86emu
   backends for BIOS calls on x86; prefer x86emu when running under Xen dom0