From 2233aa4021d8c171fe791251545096611a077596 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 11 Feb 2017 00:48:26 +0000
Subject: [PATCH 01/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 431cfd2..fbcc2be 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -177,6 +177,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 
 
 %changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From c03e67899554473443a168253c613ad96d88acc9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 27 Jul 2017 01:44:20 +0000
Subject: [PATCH 02/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index fbcc2be..afb95b1 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -177,6 +177,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 
 
 %changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From 8eaa2c24385ab4aea26687a1b34e544a36267f23 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 3 Aug 2017 04:29:27 +0000
Subject: [PATCH 03/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index afb95b1..7598925 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -177,6 +177,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 
 
 %changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From 261ce9a6dae850798e71a12881e10dd432958384 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 8 Feb 2018 09:23:03 +0000
Subject: [PATCH 04/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 7598925..14ee2cd 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -177,6 +177,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 
 
 %changelog
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 

From bed7f45659f6b277b56dfbd6f81435c598b06b08 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Mon, 26 Feb 2018 16:11:31 +0100
Subject: [PATCH 05/43] build setlayout with hardening LDFLAGS (#1548830)

---
 openbox.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 14ee2cd..2a611ef 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -102,7 +102,7 @@ sed -ie 's|^hardcode_libdir_flag_spec=.*$|hardcode_libdir_flag_spec=""|g' libtoo
 sed -ie 's|^runpath_var=LD_RUN_PATH$|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
-gcc %{optflags} -o setlayout %{SOURCE1} -lX11
+gcc $RPM_OPT_FLAGS $RPM_LD_FLAGS -o setlayout %{SOURCE1} -lX11
 
 %install
 make install DESTDIR=%{buildroot}

From f803053bff84e3810941f4bc239498ee569803c2 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Mon, 26 Feb 2018 16:17:49 +0100
Subject: [PATCH 06/43] use macro for ldconfig scriptlets

---
 openbox.spec | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/openbox.spec b/openbox.spec
index 2a611ef..1685b07 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -169,12 +169,7 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %{_datadir}/xsessions/%{name}-kde.desktop
 %{_mandir}/man1/%{name}-kde-session*.1*
 
-
-%post libs -p /sbin/ldconfig
-
-
-%postun libs -p /sbin/ldconfig
-
+%ldconfig_scriptlets libs
 
 %changelog
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-6

From 0a1719202946dde9a038e684761150fb0d5e2df6 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Mon, 26 Feb 2018 16:18:12 +0100
Subject: [PATCH 07/43] add gcc to build requirements

---
 openbox.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openbox.spec b/openbox.spec
index 1685b07..c29bf0d 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -19,6 +19,7 @@ Requires:	pyxdg
 # as discussed in https://bugzilla.redhat.com/860997
 Requires:	redhat-menus
 
+BuildRequires:	gcc
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
 BuildRequires:	pango-devel

From 570af1dcf7a764426345eb015b5d3d278761774d Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Mon, 26 Feb 2018 16:20:15 +0100
Subject: [PATCH 08/43] 3.6.1-7

---
 openbox.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index c29bf0d..e36015e 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -173,6 +173,11 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Mon Feb 26 2018 Miroslav Lichvar <mlichvar@redhat.com> - 3.6.1-7
+- build setlayout with hardening LDFLAGS (#1548830)
+- use macro for ldconfig scriptlets
+- add gcc to build requirements
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From aa3375fc3850af904c5562eb6cee0d41d6e3d635 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Tue, 17 Apr 2018 15:31:24 +0200
Subject: [PATCH 09/43] switch packaged python scripts to python3

---
 openbox-python3.patch | 113 ++++++++++++++++++++++++++++++++++++++++++
 openbox.spec          |   6 ++-
 xdg-menu              |  32 ++++++------
 3 files changed, 135 insertions(+), 16 deletions(-)
 create mode 100644 openbox-python3.patch

diff --git a/openbox-python3.patch b/openbox-python3.patch
new file mode 100644
index 0000000..f17bef3
--- /dev/null
+++ b/openbox-python3.patch
@@ -0,0 +1,113 @@
+diff -up openbox-3.6.1/data/autostart/openbox-xdg-autostart.python3 openbox-3.6.1/data/autostart/openbox-xdg-autostart
+--- openbox-3.6.1/data/autostart/openbox-xdg-autostart.python3	2013-04-17 14:27:27.000000000 +0200
++++ openbox-3.6.1/data/autostart/openbox-xdg-autostart	2018-04-17 15:52:23.849765020 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ 
+ # openbox-xdg-autostart runs things based on the XDG autostart specification
+ # Copyright (C) 2008       Dana Jansens
+@@ -28,9 +28,9 @@ try:
+     from xdg.DesktopEntry import DesktopEntry
+     from xdg.Exceptions import ParsingError
+ except ImportError:
+-    print
+-    print >>sys.stderr, "ERROR:", ME, "requires PyXDG to be installed"
+-    print
++    print()
++    print("ERROR:", ME, "requires PyXDG to be installed", file=sys.stderr)
++    print()
+     sys.exit(1)
+ 
+ def main(argv=sys.argv):
+@@ -51,7 +51,7 @@ def main(argv=sys.argv):
+             try:
+                 autofile = AutostartFile(path)
+             except ParsingError:
+-                print "Invalid .desktop file: " + path
++                print("Invalid .desktop file: " + path)
+             else:
+                 if not autofile in files:
+                     files.append(autofile)
+@@ -99,9 +99,9 @@ class AutostartFile:
+ 
+     def _alert(self, str, info=False):
+         if info:
+-            print "\t ", str
++            print("\t ", str)
+         else:
+-            print "\t*", str
++            print("\t*", str)
+ 
+     def _showInEnvironment(self, envs, verbose=False):
+         default = not self.de.getOnlyShowIn()
+@@ -146,9 +146,9 @@ class AutostartFile:
+ 
+     def display(self, envs):
+         if self._shouldRun(envs):
+-            print "[*] " + self.de.getName()
++            print("[*] " + self.de.getName())
+         else:
+-            print "[ ] " + self.de.getName()
++            print("[ ] " + self.de.getName())
+         self._alert("File: " + self.path, info=True)
+         if self.de.getExec():
+             self._alert("Executes: " + self.de.getExec(), info=True)
+@@ -165,33 +165,33 @@ class AutostartFile:
+         os.chdir(here)
+ 
+ def show_help():
+-    print "Usage:", ME, "[OPTION]... [ENVIRONMENT]..."
+-    print
+-    print "This tool will run xdg autostart .desktop files"
+-    print
+-    print "OPTIONS"
+-    print "  --list        Show a list of the files which would be run"
+-    print "                Files which would be run are marked with an asterix"
+-    print "                symbol [*].  For files which would not be run,"
+-    print "                information is given for why they are excluded"
+-    print "  --help        Show this help and exit"
+-    print "  --version     Show version and copyright information"
+-    print
+-    print "ENVIRONMENT specifies a list of environments for which to run autostart"
+-    print "applications.  If none are specified, only applications which do not "
+-    print "limit themselves to certain environments will be run."
+-    print
+-    print "ENVIRONMENT can be one or more of:"
+-    print "  GNOME         Gnome Desktop"
+-    print "  KDE           KDE Desktop"
+-    print "  ROX           ROX Desktop"
+-    print "  XFCE          XFCE Desktop"
+-    print "  Old           Legacy systems"
++    print("Usage:", ME, "[OPTION]... [ENVIRONMENT]...")
++    print()
++    print("This tool will run xdg autostart .desktop files")
++    print()
++    print("OPTIONS")
++    print("  --list        Show a list of the files which would be run")
++    print("                Files which would be run are marked with an asterix")
++    print("                symbol [*].  For files which would not be run,")
++    print("                information is given for why they are excluded")
++    print("  --help        Show this help and exit")
++    print("  --version     Show version and copyright information")
++    print()
++    print("ENVIRONMENT specifies a list of environments for which to run autostart")
++    print("applications.  If none are specified, only applications which do not ")
++    print("limit themselves to certain environments will be run.")
++    print
++    print("ENVIRONMENT can be one or more of:")
++    print("  GNOME         Gnome Desktop")
++    print("  KDE           KDE Desktop")
++    print("  ROX           ROX Desktop")
++    print("  XFCE          XFCE Desktop")
++    print("  Old           Legacy systems")
+     print
+ 
+ def show_version():
+-    print ME, VERSION
+-    print "Copyright (c) 2008        Dana Jansens"
++    print(ME, VERSION)
++    print("Copyright (c) 2008        Dana Jansens")
+     print
+ 
+ if __name__ == "__main__":
diff --git a/openbox.spec b/openbox.spec
index e36015e..8ce9d73 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -11,11 +11,14 @@ Source1:	http://icculus.org/openbox/tools/setlayout.c
 Source2:	xdg-menu
 Source3:	menu.xml
 Source4:	terminals.menu
+Patch1:		openbox-python3.patch
 
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 # required by xdg-menu and xdg-autostart scripts
-Requires:	pyxdg
+Requires:	python3-xdg
+# used by xdg-menu for icon support (optional)
+Suggests:	python3-gobject
 # as discussed in https://bugzilla.redhat.com/860997
 Requires:	redhat-menus
 
@@ -93,6 +96,7 @@ KDE session.
 
 %prep
 %setup -q
+%patch1 -p1 -b .python3
 
 
 %build
diff --git a/xdg-menu b/xdg-menu
index b3e5da0..ccd0efd 100644
--- a/xdg-menu
+++ b/xdg-menu
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # Copyright (C) 2008  Red Hat, Inc.
 #
@@ -26,6 +26,8 @@ from xml.sax.saxutils import escape
 
 icons = True
 try:
+	import gi
+	gi.require_version('Gtk', '3.0')
 	from gi.repository import Gtk
 except ImportError:
 	icons = False
@@ -54,7 +56,7 @@ def icon_attr(entry):
 	return ''
 
 def escape_utf8(s):
-	if isinstance(s, unicode):
+	if sys.version_info[0] < 3 and isinstance(s, unicode):
 		s = s.encode('utf-8', 'xmlcharrefreplace')
 	return escape(s)
 
@@ -63,25 +65,25 @@ def entry_name(entry):
 
 def walk_menu(entry):
 	if isinstance(entry, xdg.Menu.Menu) and entry.Show is True:
-		print '<menu id="%s" label="%s"%s>' \
+		print('<menu id="%s" label="%s"%s>' \
 			% (entry_name(entry),
 			entry_name(entry),
-			escape_utf8(icon_attr(entry)))
-		map(walk_menu, entry.getEntries())
-		print '</menu>'
+			escape_utf8(icon_attr(entry))))
+		list(map(walk_menu, entry.getEntries()))
+		print('</menu>')
 	elif isinstance(entry, xdg.Menu.MenuEntry) and entry.Show is True:
 		name = entry_name(entry.DesktopEntry)
-		print '	<item label="%s"%s>' % (name.replace('"', ''),
-			escape_utf8(icon_attr(entry.DesktopEntry)))
+		print('	<item label="%s"%s>' % (name.replace('"', ''),
+			escape_utf8(icon_attr(entry.DesktopEntry))))
 		command = re.sub(' -caption "%c"| -caption %c',
 			' -caption "%s"' % name,
 			escape_utf8(entry.DesktopEntry.getExec()))
 		command = re.sub(' [^ ]*%[fFuUdDnNickvm]', '', command)
 		if entry.DesktopEntry.getTerminal():
 			command = 'xterm -title "%s" -e %s' % (name, command)
-		print '		<action name="Execute">' + \
-			'<command>%s</command></action>' % command
-		print '	</item>'
+		print('		<action name="Execute">' + \
+			'<command>%s</command></action>' % command)
+		print('	</item>')
 
 if len(sys.argv) > 1:
 	menufile = sys.argv[1] + '.menu'
@@ -100,7 +102,7 @@ if icons:
 
 menu = xdg.Menu.parse(menufile)
 
-print '<?xml version="1.0" encoding="UTF-8"?>'
-print '<openbox_pipe_menu>'
-map(walk_menu, menu.getEntries())
-print '</openbox_pipe_menu>'
+print('<?xml version="1.0" encoding="UTF-8"?>')
+print('<openbox_pipe_menu>')
+list(map(walk_menu, menu.getEntries()))
+print('</openbox_pipe_menu>')

From 79bc53b34905c0b030d428055e187e0179d00e12 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Tue, 17 Apr 2018 16:02:07 +0200
Subject: [PATCH 10/43] 3.6.1-8

---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 8ce9d73..9d0aec7 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -177,6 +177,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Tue Apr 17 2018 Miroslav Lichvar <mlichvar@redhat.com> - 3.6.1-8
+- switch packaged python scripts to python3
+
 * Mon Feb 26 2018 Miroslav Lichvar <mlichvar@redhat.com> - 3.6.1-7
 - build setlayout with hardening LDFLAGS (#1548830)
 - use macro for ldconfig scriptlets

From 1f78fc3b0ad68aeb6b76636a7cb833fee229e0e6 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Tue, 17 Apr 2018 16:47:02 +0200
Subject: [PATCH 11/43] fix pyxdg requirement

---
 openbox.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 9d0aec7..e5e9ccd 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -16,7 +16,7 @@ Patch1:		openbox-python3.patch
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 # required by xdg-menu and xdg-autostart scripts
-Requires:	python3-xdg
+Requires:	python3-pyxdg
 # used by xdg-menu for icon support (optional)
 Suggests:	python3-gobject
 # as discussed in https://bugzilla.redhat.com/860997

From 3799f579f5e724b71a35c6bb4488d6152da61644 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Tue, 17 Apr 2018 16:47:17 +0200
Subject: [PATCH 12/43] 3.6.1-9

---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index e5e9ccd..b4b4b31 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -177,6 +177,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Tue Apr 17 2018 Miroslav Lichvar <mlichvar@redhat.com> - 3.6.1-9
+- fix pyxdg requirement
+
 * Tue Apr 17 2018 Miroslav Lichvar <mlichvar@redhat.com> - 3.6.1-8
 - switch packaged python scripts to python3
 

From 45a5edf5db69f0ce794a1c5f7a9cb8d922b7ce96 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 13 Jul 2018 15:03:04 +0000
Subject: [PATCH 13/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index b4b4b31..d036efa 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -177,6 +177,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Tue Apr 17 2018 Miroslav Lichvar <mlichvar@redhat.com> - 3.6.1-9
 - fix pyxdg requirement
 

From a0d3e620d3f86738f2ca9f280e7cb11f4dc3fff0 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:17:59 +0100
Subject: [PATCH 14/43] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 openbox.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/openbox.spec b/openbox.spec
index d036efa..a88286c 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -3,7 +3,6 @@ Version:	3.6.1
 Release:	10%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
-Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://openbox.org
 Source0:	http://openbox.org/dist/%{name}/%{name}-%{version}.tar.xz
@@ -58,7 +57,6 @@ package.
 
 %package	devel
 Summary:	Development files for %{name}
-Group:		Development/Libraries
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 Requires:	pkgconfig
 Requires:	pango-devel
@@ -72,7 +70,6 @@ developing applications that use %{name}.
 
 %package	libs
 Summary:	Shared libraries for %{name}
-Group:		Development/Libraries
 
 %description	libs
 The %{name}-libs package contains shared libraries used by %{name}.
@@ -80,7 +77,6 @@ The %{name}-libs package contains shared libraries used by %{name}.
 
 %package	kde
 Summary:	KDE integration for %{name}
-Group:		User Interface/Desktops
 Requires:	%{name} = %{version}-%{release}
 %if 0%{?fedora} > 21
 Requires:	plasma-workspace

From f015c5d0aa820200ab0bee562d927c5465513a25 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 1 Feb 2019 17:19:24 +0000
Subject: [PATCH 15/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index a88286c..850db67 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPLv2+
@@ -173,6 +173,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From d264c72005df79c212d5f568f99066831a06baca Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jul 2019 23:22:40 +0000
Subject: [PATCH 16/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 850db67..17da527 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPLv2+
@@ -173,6 +173,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From 16993a0cba926d022d1830fdd66e2373183e453e Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 7 Aug 2019 16:27:18 +0200
Subject: [PATCH 17/43] remove obmenu from description

---
 openbox.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 17da527..38ad1f8 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -51,7 +51,6 @@ actions, multi-head/Xinerama support, and dynamically generated "pipe menus."
 For a full list of the FreeDesktop.org standards with which it is compliant,
 please see the COMPLIANCE file in the included documentation of this package. 
 For a graphical configuration editor, you'll need to install the obconf
-package. For a graphical menu editor, you'll need to install the obmenu
 package.
 
 

From 9ab2ba9e5b4626e58f10551359fe77abfcaa4e24 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 9 Oct 2019 09:53:45 +0200
Subject: [PATCH 18/43] 3.6.1-13

---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 38ad1f8..2f83487 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPLv2+
@@ -172,6 +172,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Wed Oct 09 2019 Miroslav Lichvar <mlichvar@redhat.com> - 3.6.1-13
+- remove obmenu from description
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From 0c05a8d893a21d193188bd4404c6842e56150647 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jan 2020 20:12:38 +0000
Subject: [PATCH 19/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 2f83487..4e82f1b 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPLv2+
@@ -172,6 +172,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Wed Oct 09 2019 Miroslav Lichvar <mlichvar@redhat.com> - 3.6.1-13
 - remove obmenu from description
 

From 22c966a6ceacfd44331c29c7e24d906ce9ff66d1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jul 2020 12:39:13 +0000
Subject: [PATCH 20/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 4e82f1b..032f204 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	14%{?dist}
+Release:	15%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPLv2+
@@ -172,6 +172,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 6686f2eda74a0f2cef9b8b3017515bff8be9d87e Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Mon, 9 Nov 2020 10:45:05 +0100
Subject: [PATCH 21/43] update XDG menu prefix in KDE session script (#1851755)

---
 openbox-kf5menu.patch | 12 ++++++++++++
 openbox.spec          |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 openbox-kf5menu.patch

diff --git a/openbox-kf5menu.patch b/openbox-kf5menu.patch
new file mode 100644
index 0000000..1c3c9e5
--- /dev/null
+++ b/openbox-kf5menu.patch
@@ -0,0 +1,12 @@
+diff -up openbox-3.6.1/data/xsession/openbox-kde-session.in.kf5menu openbox-3.6.1/data/xsession/openbox-kde-session.in
+--- openbox-3.6.1/data/xsession/openbox-kde-session.in.kf5menu	2011-10-16 18:13:18.000000000 +0200
++++ openbox-3.6.1/data/xsession/openbox-kde-session.in	2020-11-09 10:42:43.755217411 +0100
+@@ -8,7 +8,7 @@ if test -n "$1"; then
+ fi
+ 
+ # Set the prefix for the menu layout to use
+-export XDG_MENU_PREFIX="kde-4-"
++export XDG_MENU_PREFIX="kf5-"
+ 
+ # Clean up after GDM
+ xprop -root -remove _NET_NUMBER_OF_DESKTOPS \
diff --git a/openbox.spec b/openbox.spec
index 032f204..f925b52 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -11,6 +11,7 @@ Source2:	xdg-menu
 Source3:	menu.xml
 Source4:	terminals.menu
 Patch1:		openbox-python3.patch
+Patch2:		openbox-kf5menu.patch
 
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -92,6 +93,7 @@ KDE session.
 %prep
 %setup -q
 %patch1 -p1 -b .python3
+%patch2 -p1 -b .kf5menu
 
 
 %build

From 7ab6491db460e32311b01c751c323fd5048df021 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Mon, 9 Nov 2020 10:51:35 +0100
Subject: [PATCH 22/43] drop obsolete KDE4 requirement

---
 openbox.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/openbox.spec b/openbox.spec
index f925b52..587d827 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -78,11 +78,7 @@ The %{name}-libs package contains shared libraries used by %{name}.
 %package	kde
 Summary:	KDE integration for %{name}
 Requires:	%{name} = %{version}-%{release}
-%if 0%{?fedora} > 21
 Requires:	plasma-workspace
-%else
-Requires:	kdebase-workspace
-%endif
 BuildArch:	noarch
 
 %description	kde

From 515c4e82f75af32d232f8e77b2d74b5d3b1c0cd5 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Mon, 9 Nov 2020 10:53:19 +0100
Subject: [PATCH 23/43] 3.6.1-16

---
 openbox.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 587d827..cf340ca 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	15%{?dist}
+Release:	16%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPLv2+
@@ -170,6 +170,10 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Mon Nov 09 2020 Miroslav Lichvar <mlichvar@redhat.com> - 3.6.1-16
+- update XDG menu prefix in KDE session script (#1851755)
+- drop obsolete KDE4 requirement
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From 56d1937abd6056e59deb53e0e7f8be2ccccae591 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Thu, 7 Jan 2021 06:28:26 +0000
Subject: [PATCH 24/43] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 openbox.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openbox.spec b/openbox.spec
index cf340ca..dccb6d8 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -22,6 +22,7 @@ Suggests:	python3-gobject
 # as discussed in https://bugzilla.redhat.com/860997
 Requires:	redhat-menus
 
+BuildRequires: make
 BuildRequires:	gcc
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils

From 9505fcee96f5d4acac478b66c3b4b3cf6dc35811 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Tue, 14 Jul 2020 02:19:15 +0000
Subject: [PATCH 25/43] Use make macros

https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
---
 openbox.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openbox.spec b/openbox.spec
index dccb6d8..8c0e4e6 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -99,12 +99,12 @@ KDE session.
 ## Fix RPATH hardcoding.
 sed -ie 's|^hardcode_libdir_flag_spec=.*$|hardcode_libdir_flag_spec=""|g' libtool
 sed -ie 's|^runpath_var=LD_RUN_PATH$|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags}
+%make_build
 
 gcc $RPM_OPT_FLAGS $RPM_LD_FLAGS -o setlayout %{SOURCE1} -lX11
 
 %install
-make install DESTDIR=%{buildroot}
+%make_install
 
 install setlayout %{buildroot}%{_bindir}
 install -p %{SOURCE2} %{buildroot}%{_libexecdir}/openbox-xdg-menu

From 5ebdc9f36b086c5d10523f53b2cbdeb2fb6525a8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 22:26:56 +0000
Subject: [PATCH 26/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 8c0e4e6..7dcf905 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	16%{?dist}
+Release:	17%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPLv2+
@@ -171,6 +171,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Nov 09 2020 Miroslav Lichvar <mlichvar@redhat.com> - 3.6.1-16
 - update XDG menu prefix in KDE session script (#1851755)
 - drop obsolete KDE4 requirement

From dc5fdda26f479d12ddac82577fc4858dba7140d5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 22 Jul 2021 17:10:08 +0000
Subject: [PATCH 27/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 7dcf905..5793875 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	17%{?dist}
+Release:	18%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPLv2+
@@ -171,6 +171,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From e2e012a9003432f98aa3ff3dcd745e8e8eadc527 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jan 2022 22:18:05 +0000
Subject: [PATCH 28/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 5793875..a7fbd13 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	18%{?dist}
+Release:	19%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPLv2+
@@ -171,6 +171,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 538b8a9951d7f22f645c3f083b9c984f1e06059e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 22 Jul 2022 02:00:05 +0000
Subject: [PATCH 29/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index a7fbd13..71fc467 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	19%{?dist}
+Release:	20%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPLv2+
@@ -171,6 +171,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 4f59b898878dec79588896084a960ad8fd94574c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 19 Jan 2023 22:44:57 +0000
Subject: [PATCH 30/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 71fc467..cb0b381 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	20%{?dist}
+Release:	21%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPLv2+
@@ -171,6 +171,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 02cd56be9f225b7cc786b3aceae43a6a8e81524e Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Thu, 27 Apr 2023 18:08:25 +0200
Subject: [PATCH 31/43] fix crash with new glib (#2178299)

---
 openbox-calc-layer.patch | 36 ++++++++++++++++++++++++++++++++++++
 openbox.spec             |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 openbox-calc-layer.patch

diff --git a/openbox-calc-layer.patch b/openbox-calc-layer.patch
new file mode 100644
index 0000000..9f00bbb
--- /dev/null
+++ b/openbox-calc-layer.patch
@@ -0,0 +1,36 @@
+From https://bugzilla.icculus.org/show_bug.cgi?id=6669#c2
+
+diff --git a/openbox/client.c b/openbox/client.c
+index 3ff278ae..ac4ff827 100644
+--- a/openbox/client.c
++++ b/openbox/client.c
+@@ -2702,9 +2702,10 @@ static void client_calc_layer_internal(ObClient *self)
+ void client_calc_layer(ObClient *self)
+ {
+     GList *it;
++    GList *list = g_list_copy(stacking_list);
+ 
+     /* skip over stuff above fullscreen layer */
+-    for (it = stacking_list; it; it = g_list_next(it))
++    for (it = list; it; it = g_list_next(it))
+         if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break;
+ 
+     /* find the windows in the fullscreen layer, and mark them not-visited */
+@@ -2717,7 +2718,7 @@ void client_calc_layer(ObClient *self)
+     client_calc_layer_internal(self);
+ 
+     /* skip over stuff above fullscreen layer */
+-    for (it = stacking_list; it; it = g_list_next(it))
++    for (it = list; it; it = g_list_next(it))
+         if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break;
+ 
+     /* now recalc any windows in the fullscreen layer which have not
+@@ -2728,6 +2729,8 @@ void client_calc_layer(ObClient *self)
+                  !WINDOW_AS_CLIENT(it->data)->visited)
+             client_calc_layer_internal(it->data);
+     }
++
++    g_list_free(it);
+ }
+ 
+ gboolean client_should_show(ObClient *self)
diff --git a/openbox.spec b/openbox.spec
index cb0b381..3a4bc79 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -12,6 +12,7 @@ Source3:	menu.xml
 Source4:	terminals.menu
 Patch1:		openbox-python3.patch
 Patch2:		openbox-kf5menu.patch
+Patch3:		openbox-calc-layer.patch
 
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -91,6 +92,7 @@ KDE session.
 %setup -q
 %patch1 -p1 -b .python3
 %patch2 -p1 -b .kf5menu
+%patch3 -p1 -b .calc-layer
 
 
 %build

From a0c5fd8179293c9cf8383fe69de84d0cfd24260b Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Thu, 27 Apr 2023 18:09:09 +0200
Subject: [PATCH 32/43] 3.6.1-22

---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 3a4bc79..0eced10 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	21%{?dist}
+Release:	22%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPLv2+
@@ -173,6 +173,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Thu Apr 27 2023 Miroslav Lichvar <mlichvar@redhat.com> - 3.6.1-22
+- fix crash with new glib (#2178299)
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 9ebd99a8a97dbbf83a6594d4f6d069be9cddf550 Mon Sep 17 00:00:00 2001
From: Leigh Scott <leigh123linux@gmail.com>
Date: Tue, 13 Jun 2023 16:57:34 +0100
Subject: [PATCH 33/43] Rebuild fo new imlib2

---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 0eced10..a1493f2 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	22%{?dist}
+Release:	23%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPLv2+
@@ -173,6 +173,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Tue Jun 13 2023 Leigh Scott <leigh123linux@gmail.com> - 3.6.1-23
+- Rebuild fo new imlib2
+
 * Thu Apr 27 2023 Miroslav Lichvar <mlichvar@redhat.com> - 3.6.1-22
 - fix crash with new glib (#2178299)
 

From fcf2dcdb06ff477e9334c0f38cea032e4559be03 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jul 2023 17:58:28 +0000
Subject: [PATCH 34/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index a1493f2..857dcc5 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	23%{?dist}
+Release:	24%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPLv2+
@@ -173,6 +173,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Tue Jun 13 2023 Leigh Scott <leigh123linux@gmail.com> - 3.6.1-23
 - Rebuild fo new imlib2
 

From bb69724b82ea28d15be662769d6e2dcba6f7d3af Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Thu, 5 Oct 2023 16:27:22 +0200
Subject: [PATCH 35/43] convert license tag to SPDX

---
 openbox.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 857dcc5..1e0ec13 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -3,7 +3,7 @@ Version:	3.6.1
 Release:	24%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
-License:	GPLv2+
+License:	GPL-2.0-or-later
 URL:		http://openbox.org
 Source0:	http://openbox.org/dist/%{name}/%{name}-%{version}.tar.xz
 Source1:	http://icculus.org/openbox/tools/setlayout.c

From fac6e6fd66a0adf71b59ec93b96b14eeb8fe0514 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 21 Jan 2024 11:05:14 +0000
Subject: [PATCH 36/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 1e0ec13..94b2b93 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	24%{?dist}
+Release:	25%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPL-2.0-or-later
@@ -173,6 +173,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From da176870d3dd1804b7db8b231b764dde0088b317 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jan 2024 11:08:23 +0000
Subject: [PATCH 37/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 94b2b93..f064729 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	25%{?dist}
+Release:	26%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPL-2.0-or-later
@@ -173,6 +173,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From ec4f1c94fae7ea1ccb2cc8046c42a0f4c487ca4b Mon Sep 17 00:00:00 2001
From: Software Management Team <packaging-team-maint@redhat.com>
Date: Thu, 30 May 2024 12:46:48 +0200
Subject: [PATCH 38/43] Eliminate use of obsolete %patchN syntax (#2283636)

---
 openbox.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openbox.spec b/openbox.spec
index f064729..50eafef 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -90,9 +90,9 @@ KDE session.
 
 %prep
 %setup -q
-%patch1 -p1 -b .python3
-%patch2 -p1 -b .kf5menu
-%patch3 -p1 -b .calc-layer
+%patch -P1 -p1 -b .python3
+%patch -P2 -p1 -b .kf5menu
+%patch -P3 -p1 -b .calc-layer
 
 
 %build

From df30a3ba8b9098b82eb8f43cf4f2852fe7b1d31e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 18 Jul 2024 20:47:12 +0000
Subject: [PATCH 39/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 50eafef..a49d514 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	26%{?dist}
+Release:	27%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPL-2.0-or-later
@@ -173,6 +173,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From d7cea7556d3951aae19dfe6fc6a6a552febf521c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jan 2025 21:35:38 +0000
Subject: [PATCH 40/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index a49d514..e2487df 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	27%{?dist}
+Release:	28%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPL-2.0-or-later
@@ -173,6 +173,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From 519c7b74d081389511108400fe4b0e9a698e48ee Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 24 Jul 2025 23:33:12 +0000
Subject: [PATCH 41/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index e2487df..30aac2c 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	28%{?dist}
+Release:	29%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPL-2.0-or-later
@@ -173,6 +173,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-28
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From ecf1c2a202fbb7db34a8af53966be2781d8f9b54 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 16 Jan 2026 22:53:21 +0000
Subject: [PATCH 42/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index 30aac2c..f29ff10 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	29%{?dist}
+Release:	30%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPL-2.0-or-later
@@ -173,6 +173,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
 * Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-29
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 

From c15289f256fc1a3c524b2cd2e5deb9afdad4908b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jul 2026 10:24:09 +0000
Subject: [PATCH 43/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

---
 openbox.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openbox.spec b/openbox.spec
index f29ff10..9e1d7f4 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.6.1
-Release:	30%{?dist}
+Release:	31%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 License:	GPL-2.0-or-later
@@ -173,6 +173,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name}
 %ldconfig_scriptlets libs
 
 %changelog
+* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-30
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild