[blackbox] Fix Fails To Build From Source

[Petr Pisar]

commit 6fabc990e94d6204c6d88c0b83aa589ff65f7d2b
Author: Petr Písař <ppisar at redhat.com>
Date:   Thu Jan 19 10:27:15 2012 +0100

    Fix Fails To Build From Source

 blackbox-0.70.1-Xutil.patch |   21 +++++++++++++++++++++
 blackbox.spec               |    8 +++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/blackbox-0.70.1-Xutil.patch b/blackbox-0.70.1-Xutil.patch
new file mode 100644
index 0000000..2b28ba7
--- /dev/null
+++ b/blackbox-0.70.1-Xutil.patch
@@ -0,0 +1,21 @@
+--- blackbox-0.70.1/lib/Util.hh.Xutil	2005-04-06 15:01:18.000000000 +0100
++++ blackbox-0.70.1/lib/Util.hh	2011-03-26 00:39:30.468690153 +0000
+@@ -25,6 +25,7 @@
+ #ifndef __Util_hh
+ #define __Util_hh
+ 
++#include <X11/Xutil.h>
+ #include <limits.h>
+ #include <string>
+ 
+@@ -94,10 +95,8 @@
+ 
+   std::string tolower(const std::string &string);
+ 
+-#ifdef _XUTIL_H_
+   std::string textPropertyToString(::Display *display,
+                                    ::XTextProperty& text_prop);
+-#endif
+ 
+ } // namespace bt
+ 
diff --git a/blackbox.spec b/blackbox.spec
index de2db77..442d171 100644
--- a/blackbox.spec
+++ b/blackbox.spec
@@ -1,7 +1,7 @@
 Summary: Very small and fast Window Manager
 Name: blackbox
 Version: 0.70.1
-Release: 16
+Release: 17
 License: MIT
 Group: User Interface/Desktops
 URL: http://blackboxwm.sourceforge.net/
@@ -9,6 +9,8 @@ Source0: http://downloads.sf.net/blackboxwm/blackbox-%{version}.tar.bz2
 Source1: blackbox.desktop
 Source2: blackbox.session
 Patch0: blackbox-0.70.1-gcc43.patch
+# Bug #660798
+Patch1: blackbox-0.70.1-Xutil.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libXt-devel, libXext-devel, libXft-devel
 # Required for autoreconf
@@ -37,6 +39,7 @@ of the utility class library for writing small applications.
 %prep
 %setup -q
 %patch0 -p1 -b .gcc43
+%patch1 -p1 -b .Xutil
 # Required to cleanly get rid of the useless rpath
 autoreconf -i -f
 
@@ -94,6 +97,9 @@ autoreconf -i -f
 
 
 %changelog
+* Thu Jan 19 2012 Niels de Vos <devos at fedoraproject.org> - 0.70.1-17
+- Fix Fails To Build From Source (#660798)
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.70.1-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild