From aed74c1ec3870286e3c9384de6747b566f4d0f6d90f422dde89bd4342029232e Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Wed, 2 Dec 2009 11:28:35 +0000
Subject: [PATCH] Accepting request 25245 from X11:XOrg

Copy from X11:XOrg/xorg-x11-server based on submit request 25245 from user sndirsch

OBS-URL: https://build.opensuse.org/request/show/25245
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=151
---
 driver-autoconfig.diff  |  2 +-
 missing_font_paths.diff | 11 +++++++++++
 xorg-x11-server.changes | 15 +++++++++++++++
 xorg-x11-server.spec    | 12 +++++++-----
 4 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 missing_font_paths.diff

diff --git a/driver-autoconfig.diff b/driver-autoconfig.diff
index 980e89d..f6c2f7d 100644
--- a/driver-autoconfig.diff
+++ b/driver-autoconfig.diff
@@ -36,7 +36,7 @@
  	case 0x100c:		    driverList[0] = "tseng";	break;
 -	case 0x1106:		    driverList[0] = "openchrome"; break;
 +	case 0x1106:		    
-+		driverList[0] = "chrome9";
++		driverList[0] = "via";
 +		driverList[1] = "openchrome";
 +		driverList[2] = "unichrome";
 +		break;
diff --git a/missing_font_paths.diff b/missing_font_paths.diff
new file mode 100644
index 0000000..3ade796
--- /dev/null
+++ b/missing_font_paths.diff
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2009-11-27 21:59:22.000000000 +0100
++++ configure.ac	2009-11-27 22:03:59.000000000 +0100
+@@ -466,7 +466,7 @@
+ AC_ARG_WITH(fontdir,         AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]),
+                                 [ FONTDIR="$withval" ],
+                                 [ FONTDIR="${libdir}/X11/fonts" ])
+-DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/truetype/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
++DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/truetype/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled,${FONTDIR}/URW,${FONTDIR}/cyrillic"
+ case $host_os in
+ 	darwin*)    DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
+ esac
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index c3848f7..fe2b51e 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sun Nov 29 17:43:43 CET 2009 - sndirsch@suse.de
+
+- driver-autoconfig.diff:
+  * VIA chipsets: switched to "via" as first try since "via" is no
+     longer renamed to "chrome9" in -chrome9 driver package and
+     -unichrome driver package now disables the "via" wrapper
+
+-------------------------------------------------------------------
+Fri Nov 27 22:14:24 CET 2009 - sndirsch@suse.de
+
+- missing_font_paths.diff
+  * added /usr/share/fonts/{URW,cyrillic} to font paths
+    (bnc #558915)
+
 -------------------------------------------------------------------
 Mon Nov  2 10:05:55 CET 2009 - sndirsch@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index a5c4ece..caf1c1c 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -33,8 +33,8 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.4
-Release:        62
-License:        GPL v2 or later ; MIT License (or similar)
+Release:        63
+License:        GPLv2+ ; MIT License (or similar)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
 %ifnarch s390 s390x
@@ -141,6 +141,7 @@ Patch200:       bug534768-prefer_local_symbols.patch
 Patch532341:    bug532341.diff
 Patch202:       0001-Check-harder-for-primary-PCI-device.patch
 Patch203:       0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch
+Patch204:       missing_font_paths.diff
 
 %description
 This package contains the X.Org Server.
@@ -148,7 +149,7 @@ This package contains the X.Org Server.
 
 
 %package extra
-License:        GPL v2 or later ; MIT License (or similar)
+License:        GPLv2+ ; MIT License (or similar)
 Summary:        Additional Xservers (Xdmx, Xephyr, Xnest, Xvfb)
 Group:          System/X11/Servers/XF86_4
 Provides:       xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-server:/usr/bin/Xvfb
@@ -162,7 +163,7 @@ This package contains additional Xservers (Xdmx, Xephyr, Xnest, Xvfb).
 
 
 %package sdk
-License:        GPL v2 or later ; MIT License (or similar)
+License:        GPLv2+ ; MIT License (or similar)
 Summary:        X.Org Server SDK
 Group:          System/Libraries
 Provides:       xorg-x11-sdk
@@ -178,7 +179,7 @@ This package contains the X.Org Server SDK.
 %if %vnc
 
 %package -n xorg-x11-Xvnc
-License:        GPL v2 or later ; MIT License (or similar)
+License:        GPLv2+ ; MIT License (or similar)
 Summary:        VNC Server for the X Window System
 Group:          System/X11/Servers/XF86_4
 Requires:       xorg-x11-fonts-core xorg-x11
@@ -286,6 +287,7 @@ popd
 %patch532341 -p1
 %patch202 -p1
 %patch203 -p1
+%patch204 -p0
 
 %build
 pushd xorg-docs-*