From a33f8a1022eededed222a504c16d703dfa49c8ecada5080fc5cb46c5178a5d16 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Fri, 26 Oct 2012 15:14:10 +0000
Subject: [PATCH] Accepting request 139276 from X11:XOrg

- Update to first tarball release 0.2.0 (forwarded request 139135 from jengelh)

OBS-URL: https://build.opensuse.org/request/show/139276
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libxkbcommon?expand=0&rev=4
---
 libxkbcommon-0.0.222.tar.xz |  3 --
 libxkbcommon-0.2.0.tar.bz2  |  3 ++
 libxkbcommon.changes        |  5 ++++
 libxkbcommon.spec           | 59 ++++++++++++++++++++++++-------------
 4 files changed, 47 insertions(+), 23 deletions(-)
 delete mode 100644 libxkbcommon-0.0.222.tar.xz
 create mode 100644 libxkbcommon-0.2.0.tar.bz2

diff --git a/libxkbcommon-0.0.222.tar.xz b/libxkbcommon-0.0.222.tar.xz
deleted file mode 100644
index e2f64d4..0000000
--- a/libxkbcommon-0.0.222.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a37b5417264fc43d1f740a1ff0abe68a2a9f368fe18887055c4a29a73335b66a
-size 101968
diff --git a/libxkbcommon-0.2.0.tar.bz2 b/libxkbcommon-0.2.0.tar.bz2
new file mode 100644
index 0000000..a4dc854
--- /dev/null
+++ b/libxkbcommon-0.2.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74eb0a121ca3998015fd687591426bb15c524645a72cf602831b2e729172fb42
+size 715987
diff --git a/libxkbcommon.changes b/libxkbcommon.changes
index 4a83383..acffc41 100644
--- a/libxkbcommon.changes
+++ b/libxkbcommon.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 23 21:00:18 UTC 2012 - jengelh@inai.de
+
+- Update to first tarball release 0.2.0
+
 -------------------------------------------------------------------
 Tue Sep 25 06:57:19 UTC 2012 - sndirsch@suse.com
 
diff --git a/libxkbcommon.spec b/libxkbcommon.spec
index a69e290..2ad4756 100644
--- a/libxkbcommon.spec
+++ b/libxkbcommon.spec
@@ -18,60 +18,79 @@
 
 Name:           libxkbcommon
 %define lname	libxkbcommon0
-Version:        0.0.222
+Version:        0.2.0
 Release:        0
-Summary:        Wayland libxkbcommon library
+Summary:        Library for handling xkb descriptions
 License:        MIT
 Group:          Development/Libraries/C and C++
-Url:            http://wayland.freedesktop.org/
+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.xz
+Source:         %name-%version.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  autoconf >= 2.60
-BuildRequires:  automake
+#git#BuildRequires:  autoconf >= 2.62
+#git#BuildRequires:  automake
 BuildRequires:  bison
 BuildRequires:  flex
-BuildRequires:  libtool
+#git#BuildRequires:  libtool >= 2
 BuildRequires:  pkgconfig
-BuildRequires:  xz
-BuildRequires:  pkgconfig(kbproto) >= 1.0.4
+BuildRequires:  pkgconfig(xkeyboard-config)
 BuildRequires:  pkgconfig(xorg-macros) >= 1.8
 BuildRequires:  pkgconfig(xproto)
 
 %description
-(Upstream has not provided a description)
+xkbcommon is a keymap handling library, which can parse XKB
+descriptions (e.g. from xkeyboard-config), and use this to help its
+users make sense of their keyboard input. Unfortunately, X11's
+requirements mean this is not actually usable for the X server, but it
+should be perfectly usable for client toolkits, as well as alternative
+windowing systems, compositors and system-level clients such as
+Wayland and kmscon.
 
 %package -n %lname
-Summary:        Wayland libxkbcommon library
+Summary:        Library for handling xkb descriptions
 Group:          System/Libraries
 
 %description -n %lname
-(Upstream has not provided a description)
+xkbcommon is a keymap handling library, which can parse XKB
+descriptions (e.g. from xkeyboard-config), and use this to help its
+users make sense of their keyboard input. Unfortunately, X11's
+requirements mean this is not actually usable for the X server, but it
+should be perfectly usable for client toolkits, as well as alternative
+windowing systems, compositors and system-level clients such as
+Wayland and kmscon.
 
 %package devel
-Summary:        Development files for the Wayland libxkbcommon library
+Summary:        Development files for the libxkbcommon library
 Group:          Development/Libraries/C and C++
 Requires:       %lname = %version
 
 %description devel
-(Upstream has not provided a description)
+xkbcommon is a keymap handling library, which can parse XKB
+descriptions (e.g. from xkeyboard-config), and use this to help its
+users make sense of their keyboard input. Unfortunately, X11's
+requirements mean this is not actually usable for the X server, but it
+should be perfectly usable for client toolkits, as well as alternative
+windowing systems, compositors and system-level clients such as
+Wayland and kmscon.
 
 This package contains the development headers for the library found
 in %lname.
 
 %prep
-%setup -qn %name
+%setup -q
 
 %build
-autoreconf -fi
+if [ ! -e configure ]; then
+	NOCONFIGURE=1 ./autogen.sh;
+fi;
 %configure --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1;
 
 %install
-%makeinstall
-rm -f "%buildroot/%_libdir"/*.la
+make install DESTDIR="%buildroot";
+rm -f "%buildroot/%_libdir"/*.la;
 
 %post -n %lname -p /sbin/ldconfig
 
@@ -83,7 +102,7 @@ rm -f "%buildroot/%_libdir"/*.la
 
 %files devel
 %defattr(-,root,root)
-%_includedir/X11/*
+%_includedir/xkbcommon
 %_libdir/libxkbcommon.so
 %_libdir/pkgconfig/xkbcommon.pc