From c773d0dc89f23c846d3fc3966edd298eb9dc207b612d74136a48df6661ca5da6 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Sun, 15 Apr 2012 10:51:40 +0000
Subject: [PATCH] Accepting request 113632 from home:dimstar:branches:X11:XOrg

Update to 1.0.6

OBS-URL: https://build.opensuse.org/request/show/113632
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xmodmap?expand=0&rev=2
---
 xmodmap-1.0.5.tar.bz2  |  3 ---
 xmodmap-1.0.6.tar.bz2  |  3 +++
 xmodmap-includes.patch | 12 ++++++++++++
 xmodmap.changes        | 16 ++++++++++++++++
 xmodmap.spec           |  8 ++++++--
 5 files changed, 37 insertions(+), 5 deletions(-)
 delete mode 100644 xmodmap-1.0.5.tar.bz2
 create mode 100644 xmodmap-1.0.6.tar.bz2
 create mode 100644 xmodmap-includes.patch

diff --git a/xmodmap-1.0.5.tar.bz2 b/xmodmap-1.0.5.tar.bz2
deleted file mode 100644
index b39bcd9..0000000
--- a/xmodmap-1.0.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:421ee7a17b0cf559c4901225f70c497e3c5ca205ec7dcc84712055818d2f3402
-size 124742
diff --git a/xmodmap-1.0.6.tar.bz2 b/xmodmap-1.0.6.tar.bz2
new file mode 100644
index 0000000..dee8c63
--- /dev/null
+++ b/xmodmap-1.0.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c58bfc948b11877c399b03240a83571ae574779b9c531f258a17acadaa9f3a5d
+size 133170
diff --git a/xmodmap-includes.patch b/xmodmap-includes.patch
new file mode 100644
index 0000000..5bb6435
--- /dev/null
+++ b/xmodmap-includes.patch
@@ -0,0 +1,12 @@
+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 a4ade8a..3963e3a 100644
--- a/xmodmap.changes
+++ b/xmodmap.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sat Apr 14 20:30:52 UTC 2012 - dimstar@opensuse.org
+
+- Update to version 1.0.6:
+  + Replace chk_malloc + sprintf with asprintf.
+  + Free copy of input line at end of process_line instead of
+    leaking it.
+  + Fix gcc -Wwrite-strings warnings.
+  + Add missing _X_NORETURN to functions that need it.
+  + Include strings.h for strcasecmp.
+  + Improve error handling in copy_to_scratch.
+  + Build system fixes.
+- Add pkgconfig(xproto) BuildRequires: new dependency.
+- Add xmodmap-includes.patch: Fix build: as asprintf is only
+  defined when building as _GNU_SOURCE.
+
 -------------------------------------------------------------------
 Fri Apr 13 08:46:08 UTC 2012 - vuntz@opensuse.org
 
diff --git a/xmodmap.spec b/xmodmap.spec
index 928dec2..9f7cb4e 100644
--- a/xmodmap.spec
+++ b/xmodmap.spec
@@ -16,8 +16,8 @@
 #
 
 Name:           xmodmap
-Version:        1.0.5
-Release:        0
+Version:        1.0.6
+Release:        1
 License:        MIT
 Summary:        Utility to modify keymaps and pointer button mappings in X
 Url:            http://xorg.freedesktop.org/
@@ -25,9 +25,12 @@ Group:          System/X11/Utilities
 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
+BuildRequires:  pkgconfig(xproto) >= 7.0.17
 # This was part of the xorg-x11 package up to version 7.6
 Conflicts:      xorg-x11 <= 7.6
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -41,6 +44,7 @@ tastes.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure