From 909eba02c0e05590b04d7132d5c86cb433662cac Mon Sep 17 00:00:00 2001
From: Hans de Goede <jwrdegoede@fedoraproject.org>
Date: Mar 12 2010 16:02:45 +0000
Subject: - Fix xawtv not starting due to it not finding its fonts


---

diff --git a/xawtv-3.95-font.patch b/xawtv-3.95-font.patch
index 02f279e..e26ec7d 100644
--- a/xawtv-3.95-font.patch
+++ b/xawtv-3.95-font.patch
@@ -1,7 +1,7 @@
-diff -Nrbu xawtv-3.95/vbistuff/alevt.css.in xawtv-3.95-OK/vbistuff/alevt.css.in
---- xawtv-3.95/vbistuff/alevt.css.in	2003-02-14 17:14:08.000000000 +0300
-+++ xawtv-3.95-OK/vbistuff/alevt.css.in	2007-03-02 19:38:26.000000000 +0300
-@@ -3,7 +3,7 @@
+diff -up xawtv-3.95/vbistuff/alevt.css.in.font xawtv-3.95/vbistuff/alevt.css.in
+--- xawtv-3.95/vbistuff/alevt.css.in.font	2003-02-14 15:14:08.000000000 +0100
++++ xawtv-3.95/vbistuff/alevt.css.in	2010-03-12 12:25:48.465315533 +0100
+@@ -3,7 +3,7 @@ body		{ background-color: white; color: 
  pre.vt		{ border: 1pt solid black; padding: 12pt }
  pre.vt		{ background-color: #c0c0c0; width: auto; float: left }
  pre.vt		{ white-space: pre }
@@ -10,16 +10,48 @@ diff -Nrbu xawtv-3.95/vbistuff/alevt.css.in xawtv-3.95-OK/vbistuff/alevt.css.in
  
  div.quick	{ clear: both }
  
-diff -Nrbu xawtv-3.95/x11/Xawtv.ad xawtv-3.95-OK/x11/Xawtv.ad
---- xawtv-3.95/x11/Xawtv.ad	2003-02-18 19:31:33.000000000 +0300
-+++ xawtv-3.95-OK/x11/Xawtv.ad	2007-03-02 19:37:26.000000000 +0300
-@@ -382,9 +382,7 @@
+diff -up xawtv-3.95/x11/Xawtv.ad.font xawtv-3.95/x11/Xawtv.ad
+--- xawtv-3.95/x11/Xawtv.ad.font	2003-02-18 17:31:33.000000000 +0100
++++ xawtv-3.95/x11/Xawtv.ad	2010-03-12 12:33:52.024563695 +0100
+@@ -5,24 +5,12 @@
+ Xawtv*international:		true
+ Xawtv*font:			7x13bold
+ Xawtv*fontSet:			\
+- -*-lucidatypewriter-bold-r-normal-*-14-*-*-*-m-*-iso8859-*, \
+-          -*-courier-bold-r-normal-*-14-*-*-*-m-*-iso8859-*, \
+-         -gnu-unifont-bold-r-normal--16-*-*-*-c-*-*-*, \
+-       -efont-biwidth-bold-r-normal--16-*-*-*-*-*-*-*, \
+-                -*-*-bold-r-normal-*-16-*-*-*-m-*-*-*, \
+-                -*-*-bold-r-normal-*-16-*-*-*-c-*-*-*, \
+-                        -*-*-*-*-*-*-16-*-*-*-*-*-*-*, *
++ -*-lucidatypewriter-bold-r-normal-*-14-*-*-*-m-*-iso8859-*
+ 
+ TopLevelShell*international:	true
+ TopLevelShell*font:		7x13bold
+ TopLevelShell*fontSet:		\
+- -*-lucidatypewriter-bold-r-normal-*-14-*-*-*-m-*-iso8859-*, \
+-          -*-courier-bold-r-normal-*-14-*-*-*-m-*-iso8859-*, \
+-         -gnu-unifont-bold-r-normal--16-*-*-*-c-*-*-*, \
+-       -efont-biwidth-bold-r-normal--16-*-*-*-*-*-*-*, \
+-                -*-*-bold-r-normal-*-16-*-*-*-m-*-*-*, \
+-                -*-*-bold-r-normal-*-16-*-*-*-c-*-*-*, \
+-                        -*-*-*-*-*-*-16-*-*-*-*-*-*-*,*
++ -*-lucidatypewriter-bold-r-normal-*-14-*-*-*-m-*-iso8859-*
+ 
+ *popup_help.title:		Welcome to xawtv!
+ xawtv.tv.help: \
+@@ -382,13 +370,8 @@ xawtv.onscreen*background:		black
  xawtv.onscreen*borderColor:		black
  xawtv.onscreen*foreground:		lightgreen
  xawtv.onscreen.label.justify:		left
 -xawtv.onscreen.label.font:		-*-ledfixed-medium-r-*--39-*-*-*-c-*-*-*
  xawtv.onscreen.label.fontSet:		\
 -     -*-ledfixed-medium-r-semicondensed--39-*-*-*-c-*-*-*, \
-  -*-bitstream vera sans-medium-r-normal--39-*-*-*-*-*-*-*, \
-            -*-luxi sans-medium-r-normal--39-*-*-*-*-*-*-*, \
-                           -*-*-r-normal--39-*-*-*-*-*-*-*, \
+- -*-bitstream vera sans-medium-r-normal--39-*-*-*-*-*-*-*, \
+-           -*-luxi sans-medium-r-normal--39-*-*-*-*-*-*-*, \
+-                          -*-*-r-normal--39-*-*-*-*-*-*-*, \
+-                               -*-*-*-*--39-*-*-*-*-*-*-*,*
++ -*-nimbus sans l-medium-r-normal--39-*-*-*-*-*-*-*
+ 
+ xawtv.vtx.allowShellResize:		true
+ xawtv.vtx.label.resize:			true
diff --git a/xawtv.spec b/xawtv.spec
index ba3536d..2d01a68 100644
--- a/xawtv.spec
+++ b/xawtv.spec
@@ -3,7 +3,7 @@
 Summary: TV applications for video4linux compliant devices
 Name: xawtv
 Version: 3.95
-Release: 12%{?dist}.1
+Release: 13%{?dist}
 Group: Applications/Multimedia
 License: GPLv2+
 URL: http://bytesex.org/xawtv/
@@ -45,7 +45,7 @@ BuildRequires: gpm-devel, slang-devel
 BuildRequires: autoconf, desktop-file-utils
 %{!?_without_libv4l:BuildRequires: libv4l-devel}
 
-Requires: usermode
+Requires: usermode xorg-x11-fonts-ISO8859-1-75dpi urw-fonts
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -164,6 +164,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar 12 2010 Hans de Goede <hdegoede@redhat.com> 3.95-13
+- Fix xawtv not starting due to it not finding its fonts
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.95-12.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild