From 8bfc0c4da54c478acf28510de31e927143446d14afe18a5eeb13e74072d95482 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Tue, 3 Feb 2015 16:41:37 +0000
Subject: [PATCH] Accepting request 283817 from home:Zaitor:branches:X11:XOrg

New stable

OBS-URL: https://build.opensuse.org/request/show/283817
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/mkfontscale?expand=0&rev=7
---
 mkfontscale-1.1.1.tar.bz2 |  3 ---
 mkfontscale-1.1.2.tar.bz2 |  3 +++
 mkfontscale.changes       | 16 ++++++++++++++++
 mkfontscale.spec          |  7 +++----
 4 files changed, 22 insertions(+), 7 deletions(-)
 delete mode 100644 mkfontscale-1.1.1.tar.bz2
 create mode 100644 mkfontscale-1.1.2.tar.bz2

diff --git a/mkfontscale-1.1.1.tar.bz2 b/mkfontscale-1.1.1.tar.bz2
deleted file mode 100644
index 5d6c611..0000000
--- a/mkfontscale-1.1.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:244017992477ced2397a44fd0ddcfb0f1d9899128613f5c4db81471163b0b731
-size 139923
diff --git a/mkfontscale-1.1.2.tar.bz2 b/mkfontscale-1.1.2.tar.bz2
new file mode 100644
index 0000000..9c50b39
--- /dev/null
+++ b/mkfontscale-1.1.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c6d5228af885477b9aec60ca6f172578e7d2de42234357af62fb00439453f20
+size 141728
diff --git a/mkfontscale.changes b/mkfontscale.changes
index 4e5acd9..896b50f 100644
--- a/mkfontscale.changes
+++ b/mkfontscale.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Feb  2 23:53:41 UTC 2015 - zaitor@opensuse.org
+
+- Update to version 1.1.2:
+  + Remove extraneous duplicate checks for -r & -n options.
+  + autogen.sh: Honor NOCONFIGURE=1.
+  + configure: Drop AM_MAINTAINER_MODE.
+  + Only include config.h if it exists.
+  + Fix possible malloc allocation error found by clang static
+    analysis.
+  + Plug a memory leak found by clang static analysis.
+  + Print which option was in error along with usage message.
+  + Make usage() always exit(1).
+  + Add -v flag to print program version.
+  + Add missing newline to usage output.
+
 -------------------------------------------------------------------
 Sat Aug 17 22:46:09 UTC 2013 - zaitor@opensuse.org
 
diff --git a/mkfontscale.spec b/mkfontscale.spec
index f665c0d..216dc45 100644
--- a/mkfontscale.spec
+++ b/mkfontscale.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package mkfontscale
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           mkfontscale
-Version:        1.1.1
+Version:        1.1.2
 Release:        0
 Summary:        Utility to create index of scalable font files for X
 License:        MIT
@@ -29,7 +29,7 @@ BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(fontenc)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(xorg-macros) >= 1.8
-BuildRequires:  pkgconfig(xproto)
+BuildRequires:  pkgconfig(xproto) >= 7.0.25
 # This was part of the xorg-x11 package up to version 7.6
 Conflicts:      xorg-x11 <= 7.6
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -40,7 +40,6 @@ legacy X11 font system.
 
 %prep
 %setup -q
-##%%patch0 -p1
 
 %build
 %configure