From 2effb5a06c38f07ad7ca05bd321ecd7e888c3f325eb752d8c15d9409638e67a1 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Sat, 17 Jul 2021 18:08:54 +0000
Subject: [PATCH] Accepting request 906844 from home:dirkmueller:Factory

- update to version 2.33
  * translation updates
  * Replaced division slash with fraction slash on Neo2 (de) layout
  * rules: correct Indic IPA to use iso639 code "eng"
  * rules: remove two non-existing ISO639 codes
  * rules: change ISO639 language codes to 639-2/T only
  * rules: the xkb.dtd file is not an XML document
  * symbols/nl: Add a "Dutch (US)" variant
  * Simplify gb(basic) so that Shift+Right Alt behaves the same as Right Alt+Shift.

OBS-URL: https://build.opensuse.org/request/show/906844
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=158
---
 xkeyboard-config-2.32.tar.bz2 |  3 ---
 xkeyboard-config-2.33.tar.bz2 |  3 +++
 xkeyboard-config.changes      | 13 +++++++++++++
 xkeyboard-config.spec         | 18 ++++++++----------
 4 files changed, 24 insertions(+), 13 deletions(-)
 delete mode 100644 xkeyboard-config-2.32.tar.bz2
 create mode 100644 xkeyboard-config-2.33.tar.bz2

diff --git a/xkeyboard-config-2.32.tar.bz2 b/xkeyboard-config-2.32.tar.bz2
deleted file mode 100644
index 1ecf4a6..0000000
--- a/xkeyboard-config-2.32.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1feee317ba39b91902b0cbd2987c0c73e6afbfc8f4c096367a5c86c216c036a8
-size 1742570
diff --git a/xkeyboard-config-2.33.tar.bz2 b/xkeyboard-config-2.33.tar.bz2
new file mode 100644
index 0000000..3dc526f
--- /dev/null
+++ b/xkeyboard-config-2.33.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:657fd790d6dcf781cd395de4cf726120a5b0f93ba91dfb2628bcc70ae8b1d3bc
+size 1755990
diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes
index 9687aa0..cad98c0 100644
--- a/xkeyboard-config.changes
+++ b/xkeyboard-config.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Jul 17 15:34:56 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- update to version 2.33
+  * translation updates
+  * Replaced division slash with fraction slash on Neo2 (de) layout
+  * rules: correct Indic IPA to use iso639 code "eng" 
+  * rules: remove two non-existing ISO639 codes
+  * rules: change ISO639 language codes to 639-2/T only 
+  * rules: the xkb.dtd file is not an XML document 
+  * symbols/nl: Add a "Dutch (US)" variant 
+  * Simplify gb(basic) so that Shift+Right Alt behaves the same as Right Alt+Shift.
+
 -------------------------------------------------------------------
 Tue Feb 16 09:27:08 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 0a89593..25b3a8f 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -17,13 +17,13 @@
 
 
 Name:           xkeyboard-config
-Version:        2.32
+Version:        2.33
 Release:        0
 Summary:        The X Keyboard Extension
-License:        GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT AND CDDL-1.0
+License:        CDDL-1.0 AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
 Group:          System/X11/Utilities
-URL:            http://www.freedesktop.org/Software/XKeyboardConfig
-Source:         http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2
+URL:            https://www.freedesktop.org/Software/XKeyboardConfig
+Source:         https://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
@@ -36,7 +36,6 @@ BuildRequires:  xsltproc
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  pkgconfig(xorg-macros) >= 1.12
 Requires(post): coreutils
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
 %description
@@ -62,10 +61,10 @@ make keyboards more accessible to people with physical impairments.
             --with-xkb-base=%{_datadir}/X11/xkb \
             --enable-compat_rules \
             --disable-runtime-deps
-make %{?_smp_mflags}
+%make_build
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
 mkdir -p %{buildroot}%{_localstatedir}/lib/xkb
 # Bug 335553
 mkdir -p %{buildroot}%{_localstatedir}/lib/xkb/compiled/
@@ -77,8 +76,8 @@ ln -snf %{_localstatedir}/lib/xkb/compiled/ %{buildroot}%{_datadir}/X11/xkb/comp
 rm -rf %{_localstatedir}/lib/xkb/compiled/server*.xkm
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS COPYING README docs/HOWTO.* docs/README.*
+%license COPYING
+%doc AUTHORS README docs/HOWTO.* docs/README.*
 %dir %{_localstatedir}/lib/xkb
 %dir %{_localstatedir}/lib/xkb/compiled
 %dir %{_datadir}/X11
@@ -87,6 +86,5 @@ rm -rf %{_localstatedir}/lib/xkb/compiled/server*.xkm
 %{_mandir}/man7/*
 
 %files lang -f %{name}.lang
-%defattr(-,root,root)
 
 %changelog