From 8413b9864c40b0c50cdc03befe70695adf55b4699509696952307c8541dc6316 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Tue, 22 Oct 2019 09:31:10 +0000
Subject: [PATCH] Accepting request 741697 from home:iznogood:branches:X11:XOrg

Suggested fix of previous sub, sorry!
Feel free to do the fixes yourself to get a feel for service usage, and nack this sub.

- Update to version 1.20.5+24:
  * Fix crash on XkbSetMap
- Drop unneeded obsinfo file and tweak _service.

OBS-URL: https://build.opensuse.org/request/show/741697
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=749
---
 _service                 | 5 ++---
 _servicedata             | 2 +-
 xorg-x11-server.changes  | 7 +++++++
 xorg-x11-server.spec     | 2 +-
 xserver-1.20.5+22.tar.xz | 3 ---
 xserver-1.20.5+24.tar.xz | 3 +++
 xserver.obsinfo          | 5 -----
 7 files changed, 14 insertions(+), 13 deletions(-)
 delete mode 100644 xserver-1.20.5+22.tar.xz
 create mode 100644 xserver-1.20.5+24.tar.xz
 delete mode 100644 xserver.obsinfo

diff --git a/_service b/_service
index b56187a..18c9029 100644
--- a/_service
+++ b/_service
@@ -2,13 +2,12 @@
   <service name="tar_scm" mode="disabled">
     <param name="url">https://gitlab.freedesktop.org/xorg/xserver.git</param>
     <param name="scm">git</param>
-    <param name="revision">c747dbb2</param>
+    <param name="revision">b6ee04e7</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
     <param name="versionrewrite-pattern">xorgserver(.*)</param>
     <param name="changesgenerate">enable</param>
   </service>
-  <service mode="disabled" name="tar" />
-  <service mode="disabled" name="recompress">
+  <service name="recompress" mode="disabled">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>
diff --git a/_servicedata b/_servicedata
index 6918e45..f6d0567 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://gitlab.freedesktop.org/xorg/xserver.git</param>
-              <param name="changesrevision">c747dbb250c11c6a02641b253e7322145dc9b913</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">b6ee04e774af1fc2e2560583c95dfac688494c2a</param></service></servicedata>
\ No newline at end of file
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 43b86e3..86449c8 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct 22 06:54:42 UTC 2019 - bjorn.lie@gmail.com
+
+- Update to version 1.20.5+24:
+  * Fix crash on XkbSetMap
+- Drop unneeded obsinfo file and tweak _service.
+
 -------------------------------------------------------------------
 Sat Oct 12 18:53:52 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 6aeb961..291e584 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -46,7 +46,7 @@
 %endif
 
 Name:           xorg-x11-server
-Version:        1.20.5+22
+Version:        1.20.5+24
 Release:        0
 Url:            http://xorg.freedesktop.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/xserver-1.20.5+22.tar.xz b/xserver-1.20.5+22.tar.xz
deleted file mode 100644
index 171e72e..0000000
--- a/xserver-1.20.5+22.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a0133add65eb6de98d994f2236356e252075b74a5ec1ae6e6f77010710f76b45
-size 3108040
diff --git a/xserver-1.20.5+24.tar.xz b/xserver-1.20.5+24.tar.xz
new file mode 100644
index 0000000..e27be03
--- /dev/null
+++ b/xserver-1.20.5+24.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea9fb153b1761e5c869e2601f45e2a9a9f5cf07065be48c75f44c8acaa94f7e9
+size 3108096
diff --git a/xserver.obsinfo b/xserver.obsinfo
deleted file mode 100644
index 8c9d75c..0000000
--- a/xserver.obsinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-name: xserver
-version: 1.20.5+22
-mtime: 1569515205
-commit: c747dbb250c11c6a02641b253e7322145dc9b913
-