- up to 2.25

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

diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 626010afe447c9a5cdfe4816e938124d4bdac931..112ab46c1da6ca1a9b7aed821d893c9f784eb622 100644 (file)
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -1,19 +1,25 @@
 Summary:       X Keyboard Configuration Database
 Summary(pl.UTF-8):     Baza danych konfiguracji klawiatury pod X
 Name:          xkeyboard-config
-Version:       1.1
-Release:       4
+Version:       2.25
+Release:       1
 License:       MIT
 Group:         X11/Development/Libraries
-Source0:       http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
-# Source0-md5: 2c76b91bd31bff78db771566578fe520
-Patch0:                %{name}-us_ee.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: a0238f95118f39f5f685dd28fbd9d24f
+URL:           https://www.freedesktop.org/wiki/Software/XKeyboardConfig
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
-BuildRequires: xorg-app-xkbcomp
+BuildRequires: gettext-tools >= 0.17
+BuildRequires: intltool >= 0.30
+BuildRequires: rpmbuild(macros) >= 1.446
+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
+# due to large maximum keycode handling
+Conflicts:     xorg-app-xkbcomp < 1.4.2
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -34,11 +40,18 @@ systemów opartych na XKB.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %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
@@ -51,22 +64,29 @@ 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}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pretrans
 # it used to be directory in xkbdata
 if [ -d %{_datadir}/X11/xkb/symbols/pc ]; then
-       rm -rf %{_datadir}/X11/xkb/symbols/pc
+       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
+%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*