[lxappearance-obconf] Fix building with openbox-3.5.2 (#992155)

[Miroslav Lichvar]

commit 3b1d92fcda2a35cfc92df87e7d0306f6daa5ce74
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Thu Aug 15 11:43:38 2013 +0200

    Fix building with openbox-3.5.2 (#992155)

 lxappearance-obconf.spec |   13 +++++++++--
 obconf-rrbutton.patch    |   49 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 3 deletions(-)
---
diff --git a/lxappearance-obconf.spec b/lxappearance-obconf.spec
index 0645fa9..a3cc519 100644
--- a/lxappearance-obconf.spec
+++ b/lxappearance-obconf.spec
@@ -16,7 +16,7 @@
 
 Name:           lxappearance-obconf
 Version:        0.2.0
-Release:        3%{?git_version:.%{?git_version}}%{?dist}
+Release:        4%{?git_version:.%{?git_version}}%{?dist}
 Summary:        Plugin to configure Openbox inside LXAppearance
 
 Group:          User Interface/Desktops
@@ -28,17 +28,19 @@ Source0:        %{name}-%{?git_version}.tar.bz2
 %else
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
 %endif
+# Patch from obconf to allow compilation with openbox-3.5.2
+Patch0:         obconf-rrbutton.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
-BuildRequires:  openbox-devel >= 3.5.0
+BuildRequires:  openbox-devel >= 3.5.2
 BuildRequires:  lxappearance-devel
 BuildRequires:  libSM-devel
 BuildRequires:  gettext
 BuildRequires:  intltool
 %{?git_snapshot:BuildRequires: libtool}
 Requires:       lxappearance >= 0.5.0
-Requires:       openbox >= 3.5.0
+Requires:       openbox >= 3.5.2
 
 %description
 This plugin adds an additional tab called "Window Border" to LXAppearance.
@@ -47,6 +49,8 @@ It is only visible when the plugin is installed and Openbox is in use.
 %prep
 %setup -q %{?git_version:-n %{name}}
 
+%patch0 -p1 -b .rrbutton
+
 
 %build
 %{?git_version:sh autogen.sh}
@@ -74,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 15 2013 Miroslav Lichvar <mlichvar at redhat.com> - 0.2.0-4
+- Fix building with openbox-3.5.2 (#992155)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/obconf-rrbutton.patch b/obconf-rrbutton.patch
new file mode 100644
index 0000000..334a9db
--- /dev/null
+++ b/obconf-rrbutton.patch
@@ -0,0 +1,49 @@
+commit 9cffa6a9ddfc4074f3de8d0302404d70c2818d8f
+Author: Markos Chandras <hwoarang at gentoo.org>
+Date:   Fri Aug 5 16:24:57 2011 +0100
+
+    Use new RrButton structure
+
+diff --git a/src/preview.c b/src/preview.c
+index a82cf15..320e7ac 100644
+--- a/src/preview.c
++++ b/src/preview.c
+@@ -327,28 +327,28 @@ static GdkPixbuf* preview_window(RrTheme *theme, const gchar *titlelayout,
+             switch (*layout) {
+             case 'D':
+                 a = focus ?
+-                    theme->a_focused_unpressed_desk :
+-                    theme->a_unfocused_unpressed_desk;
++                    theme->btn_desk->a_focused_unpressed :
++                    theme->btn_desk->a_unfocused_unpressed;
+                 break;
+             case 'S':
+                 a = focus ?
+-                    theme->a_focused_unpressed_shade :
+-                    theme->a_unfocused_unpressed_shade;
++                    theme->btn_shade->a_focused_unpressed :
++                    theme->btn_shade->a_unfocused_unpressed;
+                 break;
+             case 'I':
+                 a = focus ?
+-                    theme->a_focused_unpressed_iconify :
+-                    theme->a_unfocused_unpressed_iconify;
++                    theme->btn_iconify->a_focused_unpressed :
++                    theme->btn_iconify->a_unfocused_unpressed;
+                 break;
+             case 'M':
+                 a = focus ?
+-                    theme->a_focused_unpressed_max :
+-                    theme->a_unfocused_unpressed_max;
++                    theme->btn_max->a_focused_unpressed :
++                    theme->btn_max->a_unfocused_unpressed;
+                 break;
+             case 'C':
+                 a = focus ?
+-                    theme->a_focused_unpressed_close :
+-                    theme->a_unfocused_unpressed_close;
++                    theme->btn_close->a_focused_unpressed :
++                    theme->btn_close->a_unfocused_unpressed;
+                 break;
+             default:
+                 continue;