- updated to 2.16

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

diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 6864a10f187d7b57ed4122208d62f4f3dcf075e8..e793eaf678abe577578991838ecf381950c95f8a 100644 (file)
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -1,20 +1,24 @@
 Summary:       X Keyboard Configuration Database
 Summary(pl.UTF-8):     Baza danych konfiguracji klawiatury pod X
 Name:          xkeyboard-config
-Version:       1.7
+Version:       2.16
 Release:       1
 License:       MIT
 Group:         X11/Development/Libraries
-Source0:       http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
-# Source0-md5: d351c0109fac166edcedad32d1b0e38e
+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
-BuildRequires: intltool
+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
+Obsoletes:     xorg-data-xkbdata < 0.9
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -35,12 +39,18 @@ systemów opartych na XKB.
 
 %prep
 %setup -q
-%{__aclocal}
-%{__autoconf}
 
 %build
+%{__intltoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure \
-       --enable-xkbcomp-symlink \
+%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
@@ -53,7 +63,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 ln -s /var/lib/xkb $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 
 %find_lang %{name}
@@ -76,5 +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*