- updated to 2.16

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

diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 747c65387930dc82971336bbebf55b6de24181a9..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.5.1
+Version:       2.16
 Release:       1
 License:       MIT
 Group:         X11/Development/Libraries
-Source0:       http://xorg.freedesktop.org/archive/individual/data/%{name}-%{version}.tar.bz2
-# Source0-md5: 29cbf3980bbe94c3ffc9c233ea638059
+Source0:       http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/%{name}-%{version}.tar.bz2
+# Source0-md5: bf6aa31195584cfce01b2194c3e5ea26
 URL:           http://www.freedesktop.org/wiki/Software/XKeyboardConfig
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
-BuildRequires: gettext-devel
-# 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 \
@@ -83,7 +85,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING CREDITS ChangeLog NEWS README TODO docs/H* docs/R*
+%doc AUTHORS COPYING ChangeLog NEWS README TODO docs/H* docs/R*
 %{_datadir}/X11/xkb
 %{_npkgconfigdir}/xkeyboard-config.pc
 %{_mandir}/man7/xkeyboard-config.7*