From d5b0af0e69448ed6dc3945ea68b25dacfee9e59310a609d122747cd3aa8a68b1 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 13 Sep 2013 10:32:36 +0000
Subject: [PATCH] Accepting request 198765 from home:Zaitor:branches:X11:XOrg

Update to ver 1.0.8

OBS-URL: https://build.opensuse.org/request/show/198765
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xmodmap?expand=0&rev=5
---
 xmodmap-1.0.7.tar.bz2  |  3 ---
 xmodmap-1.0.8.tar.bz2  |  3 +++
 xmodmap-includes.patch | 12 ------------
 xmodmap.changes        | 14 ++++++++++++++
 xmodmap.spec           | 12 +++++-------
 5 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 xmodmap-1.0.7.tar.bz2
 create mode 100644 xmodmap-1.0.8.tar.bz2
 delete mode 100644 xmodmap-includes.patch

diff --git a/xmodmap-1.0.7.tar.bz2 b/xmodmap-1.0.7.tar.bz2
deleted file mode 100644
index ed00112..0000000
--- a/xmodmap-1.0.7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef22ede9c4a3c720da539292c6911515a8408e618e0dec6aa2196ee2153de4b5
-size 135223
diff --git a/xmodmap-1.0.8.tar.bz2 b/xmodmap-1.0.8.tar.bz2
new file mode 100644
index 0000000..b4313cf
--- /dev/null
+++ b/xmodmap-1.0.8.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:efe2e3c89858a2db3bdcf969f55f55d0af4f5007789198344de0595249a99fc3
+size 141026
diff --git a/xmodmap-includes.patch b/xmodmap-includes.patch
deleted file mode 100644
index 5bb6435..0000000
--- a/xmodmap-includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: xmodmap-1.0.6/xmodmap.c
-===================================================================
---- xmodmap-1.0.6.orig/xmodmap.c
-+++ xmodmap-1.0.6/xmodmap.c
-@@ -26,6 +26,7 @@ from The Open Group.
- 
- */
- 
-+#define _GNU_SOURCE
- #include <X11/Xos.h>
- #include <X11/Xlib.h>
- #include <stdio.h>
diff --git a/xmodmap.changes b/xmodmap.changes
index d29d3e7..c7698ba 100644
--- a/xmodmap.changes
+++ b/xmodmap.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Sep 12 19:37:37 UTC 2013 - zaitor@opensuse.org
+
+- Update to version 1.0.8:
+  + Add missing copyright dates from xmodmap.man to COPYING.
+  + Allow printing -help & -grammar messages without a valid
+    DISPLAY.
+  + Error in manpage example about swapping Control_L/Caps_Lock
+    keys (deb#641588).
+  + Include X11/Xwindows.h on WIN32.
+  + Include config.h before stdio.h & other system headers
+    (fdo#48696).
+- Drop xmodmap-includes.patch, fixed upstream.
+
 -------------------------------------------------------------------
 Mon Apr 23 07:02:02 UTC 2012 - vuntz@opensuse.org
 
diff --git a/xmodmap.spec b/xmodmap.spec
index 5705692..0decf67 100644
--- a/xmodmap.spec
+++ b/xmodmap.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xmodmap
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,18 +15,17 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           xmodmap
-Version:        1.0.7
+Version:        1.0.8
 Release:        0
-License:        MIT
 Summary:        Utility to modify keymaps and pointer button mappings in X
-Url:            http://xorg.freedesktop.org/
+License:        MIT
 Group:          System/X11/Utilities
+Url:            http://xorg.freedesktop.org/
 Source0:        http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
 Source1:        Xmodmap.template
 Source2:        Xmodmap.remote.template
-# PATCH-FIX-UPSTREAM xmodmap-includes.patch fdo#48696 dimstar@opensuse.org -- asprintf is only defined with _GNU_SOURCE.
-Patch0:         xmodmap-includes.patch
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xorg-macros) >= 1.8
@@ -44,7 +43,6 @@ tastes.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure