- updated to 2.16

[packages/xkeyboard-config.git] / xkeyboard-config.spec

diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index ce6dffbd8fa1f5a7ecd6c6fa18d4c51faa26ff34..e793eaf678abe577578991838ecf381950c95f8a 100644 (file)
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -1,18 +1,16 @@
 Summary:       X Keyboard Configuration Database
 Summary(pl.UTF-8):     Baza danych konfiguracji klawiatury pod X
 Name:          xkeyboard-config
-Version:       2.11
+Version:       2.16
 Release:       1
 License:       MIT
 Group:         X11/Development/Libraries
 Source0:       http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/%{name}-%{version}.tar.bz2
-# Source0-md5: e3defd29cc464cc1a1dfa0eebaca53b1
+# Source0-md5: bf6aa31195584cfce01b2194c3e5ea26
 URL:           http://www.freedesktop.org/wiki/Software/XKeyboardConfig
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
-BuildRequires: gettext-devel >= 0.18.1
-# AM_GLIB_GNU_GETTEXT
-BuildRequires: glib2-devel >= 1:2.0
+BuildRequires: gettext-tools >= 0.17
 BuildRequires: intltool >= 0.30
 BuildRequires: rpmbuild(macros) >= 1.446
 BuildRequires: xorg-app-xkbcomp
@@ -43,11 +41,15 @@ systemów opartych na XKB.
 %setup -q
 
 %build
+%{__intltoolize}
 %{__aclocal}
 %{__autoconf}
+%{__automake}
 %configure \
+%if "%{_gnu}" != "-gnux32"
        --host=%{_host} \
        --build=%{_host} \
+%endif
        --disable-runtime-deps \
        --enable-compat-rules \
        --with-xkb-rules-symlink=xorg \