- up to 2.23.1

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

diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index dd0a286d870b6df8b7749d664b6e09c01c0e9518..a374dde83a5ff7c9cc6f34d90b0d0a212c0779f8 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.13
+Version:       2.23.1
 Release:       1
 License:       MIT
 Group:         X11/Development/Libraries
-Source0:       http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/%{name}-%{version}.tar.bz2
-# Source0-md5: a415775ca8ecf4dfafc9488b8cbd7114
-URL:           http://www.freedesktop.org/wiki/Software/XKeyboardConfig
+Source0:       https://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/%{name}-%{version}.tar.bz2
+# Source0-md5: 875cbd09ab8394277fd16070326abbae
+URL:           https://www.freedesktop.org/wiki/Software/XKeyboardConfig
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
-BuildRequires: gettext-tools >= 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 \