From acba38e5f0813d97cfe992b30d7c8aee5af59c42b93f49770355076432fa409e Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Tue, 21 May 2013 09:55:23 +0000
Subject: [PATCH] Accepting request 176193 from home:Zaitor:branches:X11:XOrg

Update to ver 1.0.7

OBS-URL: https://build.opensuse.org/request/show/176193
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/bitmap?expand=0&rev=4
---
 bitmap-1.0.6.tar.bz2 |  3 ---
 bitmap-1.0.7.tar.bz2 |  3 +++
 bitmap.changes       | 10 ++++++++++
 bitmap.spec          | 15 ++++++++-------
 4 files changed, 21 insertions(+), 10 deletions(-)
 delete mode 100644 bitmap-1.0.6.tar.bz2
 create mode 100644 bitmap-1.0.7.tar.bz2

diff --git a/bitmap-1.0.6.tar.bz2 b/bitmap-1.0.6.tar.bz2
deleted file mode 100644
index af057a8..0000000
--- a/bitmap-1.0.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f70100002faf7c54b1b851261a14606c147abcc9e43f9b4e980ffc82f56eb5eb
-size 165457
diff --git a/bitmap-1.0.7.tar.bz2 b/bitmap-1.0.7.tar.bz2
new file mode 100644
index 0000000..134477d
--- /dev/null
+++ b/bitmap-1.0.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ea2823a930ddfe3bfc0c7fbb16a5b463222edf05284c5cdc40a6d3c5c3988af
+size 169437
diff --git a/bitmap.changes b/bitmap.changes
index e6b42bc..8b3f4b8 100644
--- a/bitmap.changes
+++ b/bitmap.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon May 20 21:19:50 UTC 2013 - zaitor@opensuse.org
+
+- Update to version 1.0.7:
+  + Mark usage() functions as noreturn, as suggested by gcc.
+  + Fix genererate typo in bmtoa error messages.
+  + Combine usage messages into a single string.
+  + bitmap.man:  Fix some typos.
+  + Fix pixmap leak in error paths of BWGetUnzoomedPixmap.
+
 -------------------------------------------------------------------
 Sat Apr 14 19:47:34 UTC 2012 - dimstar@opensuse.org
 
diff --git a/bitmap.spec b/bitmap.spec
index 124369a..c4b2611 100644
--- a/bitmap.spec
+++ b/bitmap.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package bitmap
 #
-# 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,22 +15,23 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           bitmap
-Version:        1.0.6
-Release:        1
-License:        MIT
+Version:        1.0.7
+Release:        0
 Summary:        X bitmap editor and converter utilities
-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
 BuildRequires:  fdupes
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xaw7)
 BuildRequires:  pkgconfig(xbitmaps)
-BuildRequires:  pkgconfig(xorg-macros) >= 1.8
 BuildRequires:  pkgconfig(xmu)
-BuildRequires:  pkgconfig(xproto)
+BuildRequires:  pkgconfig(xorg-macros) >= 1.8
+BuildRequires:  pkgconfig(xproto) >= 7.0.17
 BuildRequires:  pkgconfig(xt)
 # This was part of the xorg-x11 package up to version 7.6
 Conflicts:      xorg-x11 <= 7.6