From 15659f562e75562a9b616063186f898cdbd65031 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Mar 03 2016 19:25:04 +0000
Subject: Apply patch no.7 which hopefully fixes rhbz#823499


Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

---

diff --git a/fvwm-0007-fvwm-events.c-HandlePropertyNotify-Disable-prior-fix.patch b/fvwm-0007-fvwm-events.c-HandlePropertyNotify-Disable-prior-fix.patch
new file mode 100644
index 0000000..8161ae5
--- /dev/null
+++ b/fvwm-0007-fvwm-events.c-HandlePropertyNotify-Disable-prior-fix.patch
@@ -0,0 +1,41 @@
+From: dane <dane>
+Date: Sat, 9 Nov 2013 17:20:49 +0000
+Subject: [PATCH] 	* fvwm/events.c (HandlePropertyNotify): Disable prior
+ fix suspected of causing 	problems.
+
+
+diff --git a/ChangeLog b/ChangeLog
+index 701477c..31fbc57 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2013-11-09  Dan Espen  <despen(at)1verizon.net>
++
++	* fvwm/events.c (HandlePropertyNotify): Disable prior fix suspected of causing
++	problems.
++
+ 2012-04-20  Thomas Adam  <thomas@fvwm.org>
+ 	* configure.ac:
+ 	* docs/ANNOUNCE:
+diff --git a/fvwm/events.c b/fvwm/events.c
+index e6a1a74..a58feb1 100644
+--- a/fvwm/events.c
++++ b/fvwm/events.c
+@@ -3383,8 +3383,15 @@ void HandlePropertyNotify(const evh_args_t *ea)
+ 		 * if the icon name is NoName, set the name of the icon to be
+ 		 * the same as the window
+ 		 */
+-		if (!WAS_ICON_NAME_PROVIDED(fw) || (fw->icon_name.name &&
+-			(fw->icon_name.name != fw->name.name)))
++		if (!WAS_ICON_NAME_PROVIDED(fw)
++#if 0
++		    /* dje, reported as causing various dumps.
++		       I tried to debug, but so far haven't even figured out
++		       how to exercise this logic. Mov 9, 2013. */
++		    || (fw->icon_name.name &&
++			(fw->icon_name.name != fw->name.name))
++#endif
++)
+ 		{
+ 			fw->icon_name = fw->name;
+ 			setup_visible_name(fw, True);
diff --git a/fvwm.spec b/fvwm.spec
index bb2cbb4..d90aef6 100644
--- a/fvwm.spec
+++ b/fvwm.spec
@@ -1,6 +1,6 @@
 Name:		fvwm
 Version:	2.6.5
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	Highly configurable multiple virtual desktop window manager
 
 Group:		User Interface/X
@@ -26,6 +26,8 @@ Patch4:		fvwm-0004-Increase-number-of-mouse-buttons-supported.patch
 Patch5:		fvwm-0005-FvwmPager-be-more-careful-with-window-labels.patch
 # backported from upstream's CVS
 Patch6:		fvwm-0006-Comply-with-Debian-s-hardening-rules.patch
+# backported from upstream's CVS
+Patch7:		fvwm-0007-fvwm-events.c-HandlePropertyNotify-Disable-prior-fix.patch
 
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -62,6 +64,7 @@ and implement a virtual desktop.
 %patch4 -p1 -b .more-mouse-buttons
 %patch5 -p1 -b .fix_pager
 %patch6 -p1 -b .fix_printf_fmt
+%patch7 -p1 -b .fix_failure
 
 # Filter out false Perl provides
 cat << \EOF > %{name}-prov
@@ -113,7 +116,8 @@ install -D -m0755 -p %{SOURCE2} \
 
 
 %files -f %{name}.lang
-%doc README AUTHORS NEWS ChangeLog COPYING
+%license COPYING
+%doc README AUTHORS NEWS ChangeLog
 %{_bindir}/*
 %{_libexecdir}/%{name}/
 %{_datadir}/%{name}/
@@ -122,6 +126,9 @@ install -D -m0755 -p %{SOURCE2} \
 
 
 %changelog
+* Thu Mar  3 2016 Peter Lemenkov <lemenkov@gmail.com> - 2.6.5-12
+- Apply patch no.7 which hopefully fixes rhbz#823499
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.5-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild