From 2e967e3a8b18187caeaecb1be46acd6bf43ff839a9e77158372da1849b4bb4c2 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 19 Mar 2008 01:04:21 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/WindowMaker?expand=0&rev=5

---
 WindowMaker-wmspec.c-findBestIcon.patch | 11 +++++++++++
 WindowMaker.changes                     |  5 +++++
 WindowMaker.spec                        |  6 +++++-
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 WindowMaker-wmspec.c-findBestIcon.patch

diff --git a/WindowMaker-wmspec.c-findBestIcon.patch b/WindowMaker-wmspec.c-findBestIcon.patch
new file mode 100644
index 0000000..acb9006
--- /dev/null
+++ b/WindowMaker-wmspec.c-findBestIcon.patch
@@ -0,0 +1,11 @@
+--- src/wmspec.c
++++ src/wmspec.c
+@@ -401,7 +401,7 @@
+      * results in better overall aesthetics -Dan */
+     wanted = wPreferences.icon_size * wPreferences.icon_size;
+ 
+-    for (icon=NULL, distance=LONG_MAX, i=0L; i<items-1; ) {
++    for (icon=NULL, distance=wanted, i=0L; i<items-1; ) {
+         size = data[i] * data[i+1];
+         if (size==0)
+             break;
diff --git a/WindowMaker.changes b/WindowMaker.changes
index 5cba3b2..48177fc 100644
--- a/WindowMaker.changes
+++ b/WindowMaker.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 18 15:48:42 CET 2008 - nadvornik@suse.cz
+
+- fixed a bug in findBestIcon [bnc#371974]
+
 -------------------------------------------------------------------
 Sun Mar 16 03:25:56 CET 2008 - crrodriguez@suse.de
 
diff --git a/WindowMaker.spec b/WindowMaker.spec
index ccd60bc..3730cac 100644
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -22,7 +22,7 @@ Requires:       xdg-menu
 AutoReqProv:    on
 Summary:        A Colorful and Flexible Window Manager
 Version:        0.92.0
-Release:        147
+Release:        149
 Source:         WindowMaker-%{version}.tar.bz2
 Source1:        WindowMaker-extra-0.1.tar.bz2
 Source2:        SuSE-theme.tar.bz2
@@ -46,6 +46,7 @@ Patch34:        WindowMaker-crash.patch
 Patch35:        WindowMaker-fonts.patch
 Patch36:        WindowMaker-exec.patch
 Patch37:        WindowMaker-event.patch
+Patch38:        WindowMaker-wmspec.c-findBestIcon.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package devel
@@ -94,6 +95,7 @@ cp WindowMaker/{menu.*,plmenu.*} menu.orig
 %patch35
 %patch36
 %patch37
+%patch38
 cp %{S:4} .
 cp %{S:6} .
 rename no nb po/no.*
@@ -176,6 +178,8 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_libdir}/*.la
 
 %changelog
+* Tue Mar 18 2008 nadvornik@suse.cz
+- fixed a bug in findBestIcon [bnc#371974]
 * Sun Mar 16 2008 crrodriguez@suse.de
 - fix file-not-in-lang errors
 * Wed Jan 23 2008 nadvornik@suse.cz