From deb9f5fceafd57185229f7fd645b3db00570dc8c Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: May 27 2013 23:45:49 +0000
Subject: Merge branch 'master' into f19


Conflicts:
	libXres.spec

---

diff --git a/libXres.spec b/libXres.spec
index 9239f34..b81a8a5 100644
--- a/libXres.spec
+++ b/libXres.spec
@@ -5,7 +5,7 @@
 Summary: X-Resource extension client library
 Name: libXres
 Version: 1.0.6
-Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -18,9 +18,12 @@ Source2:    commitid
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 %endif
 
+Requires: libX11 >= 1.5.99.902
+
 BuildRequires: xorg-x11-util-macros
 BuildRequires: autoconf automake libtool
 BuildRequires: pkgconfig(xext)
+BuildRequires: pkgconfig(x11) >= 1.5.99.902
 
 %description
 X-Resource is an extension that allows a client to query
@@ -71,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon May 27 2013 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.6-6.20130524gitf46818496
+- Require libX11 1.6RC2 for _XEatDataWords
+
 * Fri May 24 2013 Dave Airlie <airlied@redhat.com> 1.0.6-5.20130524gitf46818496
 - update for CVE fixes (CVE-2013-1988)