- up to 2.25

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

diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 728a15b86d9bddfb0c401696fe554eeea397ca94..112ab46c1da6ca1a9b7aed821d893c9f784eb622 100644 (file)
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -1,26 +1,25 @@
 Summary:       X Keyboard Configuration Database
 Summary(pl.UTF-8):     Baza danych konfiguracji klawiatury pod X
 Name:          xkeyboard-config
-Version:       2.9
+Version:       2.25
 Release:       1
 License:       MIT
 Group:         X11/Development/Libraries
-Source0:       http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/%{name}-%{version}.tar.bz2
-# Source0-md5: 9b1280d8ba40274a0f1567c94fca7501
-URL:           http://www.freedesktop.org/wiki/Software/XKeyboardConfig
+Source0:       https://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/%{name}-%{version}.tar.bz2
+# Source0-md5: a0238f95118f39f5f685dd28fbd9d24f
+URL:           https://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
 BuildRequires: xorg-util-util-macros >= 1.12
 # for sinhala layouts
 Requires:      xorg-lib-libX11 >= 1.4.3
 Provides:      xorg-data-xkbdata
 Obsoletes:     xorg-data-xkbdata < 0.9
+# due to large maximum keycode handling
+Conflicts:     xorg-app-xkbcomp < 1.4.2
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -43,11 +42,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 +86,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*