From 818cabfb2d90462c78712b4981ada20d3c8c4449035583cc12c5cfaa21857614 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Tue, 19 Feb 2013 14:24:58 +0000
Subject: [PATCH] Accepting request 155793 from
 home:sndirsch:branches:X11:terminals

- fixed check for existance of bdftopcf; added bdftopcf
  Buildrequires for openSUSE > 12.1 (bnc#804329)

OBS-URL: https://build.opensuse.org/request/show/155793
OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=64
---
 xterm.changes | 6 ++++++
 xterm.spec    | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/xterm.changes b/xterm.changes
index 6032537..e197573 100644
--- a/xterm.changes
+++ b/xterm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 19 10:00:45 UTC 2013 - sndirsch@suse.com
+
+- fixed check for existance of bdftopcf; added bdftopcf
+  Buildrequires for openSUSE > 12.1 (bnc#804329)
+
 -------------------------------------------------------------------
 Mon Feb 18 13:07:25 UTC 2013 - abergmann@novell.com
 
diff --git a/xterm.spec b/xterm.spec
index 43f1bf5..16859a2 100644
--- a/xterm.spec
+++ b/xterm.spec
@@ -37,6 +37,8 @@ BuildRequires:  xorg-x11-devel
 %if 0%{?suse_version} > 1210
 # post xorg libs split
 BuildRequires:  libXaw-devel
+# separate package now
+BuildRequires:  bdftopcf
 %endif
 %else
 BuildRequires:  XFree86-devel
@@ -136,7 +138,7 @@ pushd "../vttest-%vttest_version"
 make %{?_smp_mflags}
 popd
 
-if [ ! which bdftopcf ] ; then exit 1; fi
+if ! which bdftopcf &> /dev/null; then exit 1; fi
 for i in *.bdf
 do
     bdftopcf "$i" | gzip -9 >"${i%.bdf}.pcf.gz"