From eb238aa0320b5055f36316d87cf15ab65a3755f636ad4ebf821d6718bc205e9d Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Wed, 17 Apr 2013 21:05:47 +0000
Subject: [PATCH] Accepting request 171223 from X11:Wayland

- Update to new upstream release 0.3.0
* This introduces the xkb_keymap_new_from_buffer API, relaxes
  restrictions on the xkb_keymap_new_from_names API, introduces
  support for setting default keymaps from the environment, and
  includes several new bugfixes, as well as swathes of testing
  improvements.

OBS-URL: https://build.opensuse.org/request/show/171223
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libxkbcommon?expand=0&rev=6
---
 libxkbcommon-0.2.0.tar.bz2 |  3 ---
 libxkbcommon-0.3.0.tar.xz  |  3 +++
 libxkbcommon.changes       | 10 ++++++++++
 libxkbcommon.spec          | 15 ++++++++-------
 4 files changed, 21 insertions(+), 10 deletions(-)
 delete mode 100644 libxkbcommon-0.2.0.tar.bz2
 create mode 100644 libxkbcommon-0.3.0.tar.xz

diff --git a/libxkbcommon-0.2.0.tar.bz2 b/libxkbcommon-0.2.0.tar.bz2
deleted file mode 100644
index a4dc854..0000000
--- a/libxkbcommon-0.2.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:74eb0a121ca3998015fd687591426bb15c524645a72cf602831b2e729172fb42
-size 715987
diff --git a/libxkbcommon-0.3.0.tar.xz b/libxkbcommon-0.3.0.tar.xz
new file mode 100644
index 0000000..69672a3
--- /dev/null
+++ b/libxkbcommon-0.3.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:866c0df88f806dff8fc859b6f082cf9f8b6c3b549f0a367541e12b1ca28a5d65
+size 618696
diff --git a/libxkbcommon.changes b/libxkbcommon.changes
index acffc41..1d523d0 100644
--- a/libxkbcommon.changes
+++ b/libxkbcommon.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Apr 17 05:49:07 UTC 2013 - jengelh@inai.de
+
+- Update to new upstream release 0.3.0
+* This introduces the xkb_keymap_new_from_buffer API, relaxes
+  restrictions on the xkb_keymap_new_from_names API, introduces
+  support for setting default keymaps from the environment, and
+  includes several new bugfixes, as well as swathes of testing
+  improvements.
+
 -------------------------------------------------------------------
 Tue Oct 23 21:00:18 UTC 2012 - jengelh@inai.de
 
diff --git a/libxkbcommon.spec b/libxkbcommon.spec
index 2ad4756..a4122d2 100644
--- a/libxkbcommon.spec
+++ b/libxkbcommon.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libxkbcommon
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 Name:           libxkbcommon
 %define lname	libxkbcommon0
-Version:        0.2.0
+Version:        0.3.0
 Release:        0
 Summary:        Library for handling xkb descriptions
 License:        MIT
@@ -27,7 +27,7 @@ Url:            http://xkbcommon.org/
 
 #Git-Clone:	git://anongit.freedesktop.org/xorg/lib/libxkbcommon
 #Git-Web:	http://cgit.freedesktop.org/xorg/lib/libxkbcommon/
-Source:         %name-%version.tar.bz2
+Source:         http://xkbcommon.org/download/%name-%version.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #git#BuildRequires:  autoconf >= 2.62
 #git#BuildRequires:  automake
@@ -35,6 +35,7 @@ BuildRequires:  bison
 BuildRequires:  flex
 #git#BuildRequires:  libtool >= 2
 BuildRequires:  pkgconfig
+BuildRequires:  xz
 BuildRequires:  pkgconfig(xkeyboard-config)
 BuildRequires:  pkgconfig(xorg-macros) >= 1.8
 BuildRequires:  pkgconfig(xproto)
@@ -85,15 +86,15 @@ in %lname.
 if [ ! -e configure ]; then
 	NOCONFIGURE=1 ./autogen.sh;
 fi;
-%configure --disable-static
+# Ensure people will use pkgconfig to locate headers.
+%configure --disable-static --includedir="%_includedir/pkg/%name"
 make %{?_smp_mflags} V=1;
 
 %install
 make install DESTDIR="%buildroot";
 rm -f "%buildroot/%_libdir"/*.la;
 
-%post -n %lname -p /sbin/ldconfig
-
+%post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig
 
 %files -n %lname
@@ -102,7 +103,7 @@ rm -f "%buildroot/%_libdir"/*.la;
 
 %files devel
 %defattr(-,root,root)
-%_includedir/xkbcommon
+%_includedir/pkg/
 %_libdir/libxkbcommon.so
 %_libdir/pkgconfig/xkbcommon.pc