- up to 2.23.1

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

diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index be823812dcf24bc8b98c4cde936a3490ff1177b6..a374dde83a5ff7c9cc6f34d90b0d0a212c0779f8 100644 (file)
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -1,20 +1,16 @@
 Summary:       X Keyboard Configuration Database
 Summary(pl.UTF-8):     Baza danych konfiguracji klawiatury pod X
 Name:          xkeyboard-config
-Version:       2.4.1
-Release:       3
+Version:       2.23.1
+Release:       1
 License:       MIT
 Group:         X11/Development/Libraries
-Source0:       http://xorg.freedesktop.org/archive/individual/data/%{name}-%{version}.tar.bz2
-# Source0-md5: 9f6d7a37fd192264a3ca07ede5d183c3
-Patch0:                %{name}-CVE-2012-0064.patch
-Patch1:                %{name}-function-keys.patch
-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-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
@@ -44,15 +40,16 @@ systemów opartych na XKB.
 %prep
 %setup -q
 
-%patch0 -p1
-%patch1 -p1
-
 %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 \
@@ -88,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*