From ff3bea153004ae2c359d03962601d5a097585956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Wed, 12 Apr 2006 19:26:48 +0000
Subject: [PATCH] - Revert to upstream default font, require
 xorg-x11-fonts-base (#183971).

---
 xosd-defaults.patch | 12 ------------
 xosd.spec           | 17 ++++++++++-------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/xosd-defaults.patch b/xosd-defaults.patch
index 43ff81e..914bd77 100644
--- a/xosd-defaults.patch
+++ b/xosd-defaults.patch
@@ -12,18 +12,6 @@ diff -Naru xosd-2.2.14.orig/src/bmp_plugin/bmp_osd.c xosd-2.2.14/src/bmp_plugin/
    shadow_offset = 1;
    outline_offset = 0;
    pos = XOSD_bottom;
-diff -Naru xosd-2.2.14.orig/src/libxosd/xosd.c xosd-2.2.14/src/libxosd/xosd.c
---- xosd-2.2.14.orig/src/libxosd/xosd.c	2004-11-17 21:27:11.000000000 +0200
-+++ xosd-2.2.14/src/libxosd/xosd.c	2005-03-17 23:43:48.000000000 +0200
-@@ -24,7 +24,7 @@
- #define XOFFSET 10
- 
- const char *osd_default_font =
--  "-misc-fixed-medium-r-semicondensed--*-*-*-*-c-*-*-*";
-+  "-*-luxi sans-*-r-*-*-17-*-*-*-*-*-*-*";
- #if 0
- "-adobe-helvetica-bold-r-*-*-10-*";
- #endif
 diff -Naru xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c xosd-2.2.14/src/xmms_plugin/xmms_osd.c
 --- xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c	2004-11-04 21:47:50.000000000 +0200
 +++ xosd-2.2.14/src/xmms_plugin/xmms_osd.c	2005-03-17 23:42:11.000000000 +0200
diff --git a/xosd.spec b/xosd.spec
index 15f0250..e7ccbe7 100644
--- a/xosd.spec
+++ b/xosd.spec
@@ -5,7 +5,7 @@
 
 Name:           xosd
 Version:        2.2.14
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        On-screen display library for X
 
 Group:          System Environment/Libraries
@@ -16,15 +16,11 @@ Patch0:         %{name}-aclocal18.patch
 Patch1:         %{name}-defaults.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Needed for main xosd:
 BuildRequires:  libX11-devel
 BuildRequires:  libXext-devel
 BuildRequires:  libXinerama-devel
-# ...and for the bmp and xmms plugins:
-BuildRequires:  gtk+-devel >= 1:1.2.2
-BuildRequires:  gdk-pixbuf-devel >= 1:0.22.0
-BuildRequires:  xmms-devel
-BuildRequires:  bmp-devel
+# As of 2.2.14, the default font *must* be found, even if not used (#183971)
+Requires:       xorg-x11-fonts-base
 
 %description
 XOSD displays text on your screen, sounds simple right? The difference
@@ -49,6 +45,9 @@ display.
 %package     -n xmms-%{name}
 Summary:        XMMS plugin for on-screen display using the XOSD library
 Group:          Applications/Multimedia
+BuildRequires:  gtk+-devel >= 1:1.2.2
+BuildRequires:  gdk-pixbuf-devel >= 1:0.22.0
+BuildRequires:  xmms-devel
 Requires:       %{name} = %{version}-%{release}
 Requires:       xmms
 Obsoletes:      %{name}-xmms <= 2.2.12
@@ -60,6 +59,7 @@ the XOSD library, similarly to TV OSD.
 %package     -n bmp-%{name}
 Summary:        BMP plugin for on-screen display using the XOSD library
 Group:          Applications/Multimedia
+BuildRequires:  bmp-devel
 Requires:       %{name} = %{version}-%{release}
 Requires:       bmp
 
@@ -128,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.2.14-6
+- Revert to upstream default font, require xorg-x11-fonts-base (#183971).
+
 * Sun Mar 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.2.14-5
 - Convert docs to UTF-8.