Summary: X Keyboard Configuration Database
+Summary(pl.UTF-8): Baza danych konfiguracji klawiatury pod X
Name: xkeyboard-config
-Version: 0.9
-Release: 0.2
-License: BSD
+Version: 2.16
+Release: 1
+License: MIT
Group: X11/Development/Libraries
-Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
-# Source0-md5: 52afe60101ace8532881e70f6c2dc020
-URL: http://www.freedesktop.org/wiki/Software_2fXKeyboardConfig
+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-tools >= 0.17
+BuildRequires: intltool >= 0.30
+BuildRequires: rpmbuild(macros) >= 1.446
BuildRequires: xorg-app-xkbcomp
-BuildArch: noarch
-Obsoletes: xorg-data-xkbdata
+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
+BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-The non-arch keyboard configuration database for X Window. The goal is
-to provide the consistent, well-structured, frequently released open
-source of X keyboard configuration data for X Window System
-implementations (free, open source and commercial). The project is
-targetted to XKB-based systems.
+The non-arch keyboard configuration database for X Window System. The
+goal is to provide the consistent, well-structured, frequently
+released open source of X keyboard configuration data for X Window
+System implementations (free, open source and commercial). The project
+is targeted to XKB-based systems.
+
+%description -l pl.UTF-8
+Niezależna od architektury baza danych konfiguracji klawiatury dla
+systemu X Window. Celem jest dostarczenie spójnych, dobrze
+zbudowanych, często wydawanych danych konfiguracji klawiatury pod X z
+otwartymi źródłami dla implementacji X Window System (wolnodostępnych,
+mających otwarte źródła i komercyjnych). Projekt jest przeznaczony dla
+systemów opartych na XKB.
%prep
%setup -q
%build
-%configure \
- --enable-xkbcomp-symlink \
+%{__intltoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+%configure \
+%if "%{_gnu}" != "-gnux32"
+ --host=%{_host} \
+ --build=%{_host} \
+%endif
+ --disable-runtime-deps \
--enable-compat-rules \
+ --with-xkb-rules-symlink=xorg \
--with-xkb-base=%{_datadir}/X11/xkb
%{__make}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+ln -s /var/lib/xkb $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
+
+%find_lang %{name}
+
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%pretrans
+# it used to be directory in xkbdata
+if [ -d %{_datadir}/X11/xkb/symbols/pc ]; then
+ mv -b %{_datadir}/X11/xkb/symbols/pc{,.dir}
+%banner -e %{name} <<EOF
+Check out %{_datadir}/X11/xkb/symbols/pc.dir
+for your own files and remove it when done.
+EOF
+fi
+if [ -d %{_datadir}/X11/xkb/compiled ]; then
+ rm -rf %{_datadir}/X11/xkb/compiled
+fi
+
+%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS CREDITS ChangeLog NEWS README TODO docs/H* docs/R*
+%doc AUTHORS COPYING ChangeLog NEWS README TODO docs/H* docs/R*
%{_datadir}/X11/xkb
-%exclude %{_datadir}/X11/xkb/compiled
+%{_npkgconfigdir}/xkeyboard-config.pc
+%{_mandir}/man7/xkeyboard-config.7*