From 7b5e7ccbe113f2a1519cc83f2293bb2ad3634433 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Thu, 2 Jul 2015 10:51:57 +0200
Subject: [PATCH] update to 3.6.1

---
 .gitignore           |  2 +-
 openbox-abifix.patch | 12 ------------
 openbox.spec         |  8 ++------
 sources              |  2 +-
 4 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 openbox-abifix.patch

diff --git a/.gitignore b/.gitignore
index 31ce950..65d1291 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /setlayout.c
-/openbox-3.6.tar.gz
+/openbox-3.6.1.tar.xz
diff --git a/openbox-abifix.patch b/openbox-abifix.patch
deleted file mode 100644
index 1ae4f91..0000000
--- a/openbox-abifix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up openbox-3.6/obrender/theme.h.abifix openbox-3.6/obrender/theme.h
---- openbox-3.6/obrender/theme.h.abifix	2015-01-12 20:48:27.000000000 +0100
-+++ openbox-3.6/obrender/theme.h	2015-06-25 17:28:43.401411179 +0200
-@@ -114,6 +114,8 @@ struct _RrTheme {
-     RrColor *osd_pressed_lineart;
-     RrColor *osd_focused_lineart;
-     RrColor *menu_title_shadow_color;
-+    /* padding to make libobrender compatible with openbox-3.5.2 */
-+    void *_pad[8];
-     RrColor *menu_text_shadow_color;
- 
-     /* style settings - pics */
diff --git a/openbox.spec b/openbox.spec
index 34acd35..e140d9f 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,20 +1,17 @@
 Name:		openbox
-Version:	3.6
+Version:	3.6.1
 Release:	3%{?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.gz
+Source0:	http://openbox.org/dist/%{name}/%{name}-%{version}.tar.xz
 Source1:	http://icculus.org/openbox/tools/setlayout.c
 Source2:	xdg-menu
 Source3:	menu.xml
 Source4:	terminals.menu
 
-# restore libobrender compatibility, remove when soname is bumped!
-Patch1:		openbox-abifix.patch
-
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 # required by xdg-menu and xdg-autostart scripts
@@ -95,7 +92,6 @@ KDE session.
 
 %prep
 %setup -q
-%patch1 -p1 -b .abifix
 
 
 %build
diff --git a/sources b/sources
index afaa06f..34cf0c4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 16ca0d290cae2f4c16a35e9cdfb6f503  setlayout.c
-a995a15361b18f24e45f9be752e89f4e  openbox-3.6.tar.gz
+46bf5f1edda0eda0d9e824b585988be9  openbox-3.6.1.tar.xz