From c8f61abbc96e8ab56617fcc1f4f6cc0243f1b3e135de0ae0d239499ed0442ce2 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Wed, 8 Jun 2016 09:00:25 +0000
Subject: [PATCH] Accepting request 400619 from
 home:scarabeus_iv:branches:X11:XOrg

- Run over with spec-cleaner - pkgconfig/perl deps conversion
- Use post dependency on coreutils instead of prereq
- Disable silent rules to see whats happening
- Tweak configure options to match what configure.ac contains and what
  is needed
- Remove path provides on the old /etc location, should not be needed
  after all those years

OBS-URL: https://build.opensuse.org/request/show/400619
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=126
---
 xkeyboard-config.changes | 11 +++++++
 xkeyboard-config.spec    | 63 +++++++++++++++++++---------------------
 2 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes
index b3fb968..4db72d2 100644
--- a/xkeyboard-config.changes
+++ b/xkeyboard-config.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Jun  8 07:46:48 UTC 2016 - tchvatal@suse.com
+
+- Run over with spec-cleaner - pkgconfig/perl deps conversion
+- Use post dependency on coreutils instead of prereq
+- Disable silent rules to see whats happening
+- Tweak configure options to match what configure.ac contains and what
+  is needed
+- Remove path provides on the old /etc location, should not be needed
+  after all those years
+
 -------------------------------------------------------------------
 Mon Jun  6 12:14:01 UTC 2016 - sndirsch@suse.com
 
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index adc49e0..45503d4 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -17,29 +17,27 @@
 
 
 Name:           xkeyboard-config
-BuildRequires:  fdupes
-BuildRequires:  intltool
-BuildRequires:  perl-XML-Parser
-BuildRequires:  pkg-config
-BuildRequires:  translation-update-upstream
-BuildRequires:  xsltproc
-BuildRequires:  pkgconfig(xorg-macros) >= 1.12
-Url:            http://www.freedesktop.org/Software/XKeyboardConfig
-Provides:       XFree86:/etc/X11/xkb/symbols/us
-Provides:       xorg-x11:/etc/X11/xkb/symbols/us
-PreReq:         /bin/ln /bin/rm
 Version:        2.18
 Release:        0
 Summary:        The X Keyboard Extension
 License:        GPL-2.0+ and LGPL-2.1+ and MIT and CDDL-1.0
 Group:          System/X11/Utilities
-Source:         http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/xkeyboard-config-%{version}.tar.bz2
+Url:            http://www.freedesktop.org/Software/XKeyboardConfig
+Source:         http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2
 Patch100:       n_suse-ctrl-alt-bksp-terminate.patch
 # PATCH-FIX-OPENSUSE disable-2xalt_2xctrl-toggle.diff fdo#4927 -- This is just a workaround until fdo#4927 is fixed
 Patch109:       n_disable-2xalt_2xctrl-toggle.diff
+BuildRequires:  fdupes
+BuildRequires:  intltool
+BuildRequires:  pkgconfig
+BuildRequires:  translation-update-upstream
+BuildRequires:  xsltproc
+BuildRequires:  perl(XML::Parser)
+BuildRequires:  pkgconfig(xorg-macros) >= 1.12
+Requires(post): coreutils
+Recommends:     %{name}-lang
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-Recommends:     %{name}-lang
 
 %description
 The X Keyboard Extension essentially replaces the core protocol
@@ -50,6 +48,7 @@ keyboard. It also includes a number of keyboard controls designed to
 make keyboards more accessible to people with physical impairments.
 
 %lang_package
+
 %prep
 %setup -q
 translation-update-upstream
@@ -57,39 +56,37 @@ translation-update-upstream
 %patch109 -p1
 
 %build
-%configure --with-xkb-rules-symlink=xfree86,xorg \
-            --with-xkb-base=/usr/share/X11/xkb \
+%configure \
+            --disable-silent-rules \
+            --with-xkb-rules-symlink=xorg \
+            --with-xkb-base=%{_datadir}/X11/xkb \
             --enable-compat_rules \
-            --disable-runtime-deps \
-            --disable-xkbcomp-symlink
-rm -f */*.dir
-make 
+            --disable-runtime-deps
+make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/var/lib/xkb
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
+mkdir -p %{buildroot}%{_localstatedir}/lib/xkb
 # Bug 335553
-mkdir -p $RPM_BUILD_ROOT/var/lib/xkb/compiled/
-ln -snf /var/lib/xkb/compiled/ $RPM_BUILD_ROOT/usr/share/X11/xkb/compiled
-%find_lang %{name} %{?no_lang_C}
-%fdupes -s $RPM_BUILD_ROOT/usr/share/X11/xkb
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p %{buildroot}%{_localstatedir}/lib/xkb/compiled/
+ln -snf %{_localstatedir}/lib/xkb/compiled/ %{buildroot}%{_datadir}/X11/xkb/compiled
+%find_lang %{name}
+%fdupes -s %{buildroot}%{_datadir}/X11/xkb
 
 %post
-rm -rf /var/lib/xkb/compiled/server*.xkm
+rm -rf %{_localstatedir}/lib/xkb/compiled/server*.xkm
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING README docs/HOWTO.* docs/README.*
-%dir /var/lib/xkb
-%dir /var/lib/xkb/compiled
-%dir /usr/share/X11
-/usr/share/X11/xkb/
+%dir %{_localstatedir}/lib/xkb
+%dir %{_localstatedir}/lib/xkb/compiled
+%dir %{_datadir}/X11
+%{_datadir}/X11/xkb/
 %{_datadir}/pkgconfig/*.pc
 %{_mandir}/man7/*
 
 %files lang -f %{name}.lang
+%defattr(-,root,root)
 
 %changelog