[openbox] update to 3.5.0

[Miroslav Lichvar]

commit e7d187599a1491b413cb2f7f64e8768dd5034db2
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Fri Aug 5 15:57:35 2011 +0200

    update to 3.5.0

 .gitignore                       |    4 +-
 menu.xml                         |    8 +++---
 openbox-3.4.11-Xau.patch         |   19 ---------------
 openbox-3.4.7.2-24bit.patch      |   48 --------------------------------------
 openbox-3.4.9-autostartdir.patch |   12 ---------
 openbox.spec                     |   22 ++++++-----------
 sources                          |    2 +-
 7 files changed, 15 insertions(+), 100 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0dacaf4..bc8d4e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-setlayout.c
-openbox-3.4.11.2.tar.gz
+/setlayout.c
+/openbox-3.5.0.tar.gz
diff --git a/menu.xml b/menu.xml
index 2461b31..238cf52 100644
--- a/menu.xml
+++ b/menu.xml
@@ -2,10 +2,10 @@
 
 <openbox_menu xmlns="http://openbox.org/3.4/menu">
 
-<menu id="applications-menu" label="Applications" execute="_DATADIR_/xdg-menu applications"/>
-<menu id="preferences-menu" label="Preferences" execute="_DATADIR_/xdg-menu preferences"/>
-<menu id="administration-menu" label="Administration" execute="_DATADIR_/xdg-menu system-settings"/>
-<menu id="terminals-menu" label="Terminals" execute="_DATADIR_/xdg-menu _DATADIR_/terminals"/>
+<menu id="applications-menu" label="Applications" execute="_LIBEXECDIR_/openbox-xdg-menu applications"/>
+<menu id="preferences-menu" label="Preferences" execute="_LIBEXECDIR_/openbox-xdg-menu preferences"/>
+<menu id="administration-menu" label="Administration" execute="_LIBEXECDIR_/openbox-xdg-menu system-settings"/>
+<menu id="terminals-menu" label="Terminals" execute="_LIBEXECDIR_/openbox-xdg-menu /etc/xdg/openbox/terminals"/>
 
 <menu id="root-menu" label="Openbox 3">
   <separator label="Openbox"/>
diff --git a/openbox.spec b/openbox.spec
index b4fa7e0..def88a1 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
-Version:	3.4.11.2
-Release:	8%{?dist}
+Version:	3.5.0
+Release:	1%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -14,10 +14,7 @@ Source4:	openbox.desktop
 Source5:	terminals.menu
 Source6:	openbox.gnome-session
 
-Patch0:		openbox-3.4.9-autostartdir.patch
-Patch1:		openbox-3.4.11-Xau.patch
 Patch2:		openbox-3.4.11.2-gnomesession.patch
-Patch4:		openbox-3.4.7.2-24bit.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -97,10 +94,7 @@ KDE session.
 
 %prep
 %setup -q
-%patch0 -p1 -b .autostartdir
-%patch1 -p1 -b .Xau
 %patch2 -p1 -b .gnome
-%patch4 -p1 -b .24bit
 
 
 %build
@@ -118,15 +112,15 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 install setlayout %{buildroot}%{_bindir}
-install -p %{SOURCE2} %{buildroot}%{_datadir}/%{name}/xdg-menu
-sed 's|_DATADIR_|%{_datadir}/%{name}|g' < %{SOURCE3} \
+install -p %{SOURCE2} %{buildroot}%{_libexecdir}/openbox-xdg-menu
+sed 's|_LIBEXECDIR_|%{_libexecdir}|g' < %{SOURCE3} \
 	> %{buildroot}%{_sysconfdir}/xdg/%{name}/menu.xml
 
 desktop-file-install --vendor="" \
         --dir=%{buildroot}%{_datadir}/applications \
         %{SOURCE4}
 
-install -m644 -p %{SOURCE5} %{buildroot}%{_datadir}/%{name}/terminals.menu
+install -m644 -p %{SOURCE5} %{buildroot}%{_sysconfdir}/xdg/%{name}/terminals.menu
 install -m644 -D %{SOURCE6} \
 	%{buildroot}%{_datadir}/gnome-session/sessions/gnome-openbox.session
 
@@ -149,8 +143,8 @@ rm -rf %{buildroot}
 %{_bindir}/%{name}-session
 %{_bindir}/obxprop
 %{_bindir}/setlayout
+%{_libexecdir}/openbox-*
 %{_datadir}/applications/*%{name}.desktop
-%{_datadir}/%{name}
 %{_datadir}/themes/*/
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/xsessions/%{name}.desktop
@@ -162,13 +156,13 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/libobrender.so.*
-%{_libdir}/libobparser.so.*
+%{_libdir}/libobt.so.*
 
 %files	devel
 %defattr(-,root,root,-)
 %{_includedir}/%{name}/
 %{_libdir}/libobrender.so
-%{_libdir}/libobparser.so
+%{_libdir}/libobt.so
 %{_libdir}/pkgconfig/*.pc
 
 %files  gnome
diff --git a/sources b/sources
index 5c821eb..9f31b00 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 16ca0d290cae2f4c16a35e9cdfb6f503  setlayout.c
-30e669134fa81df810fe7d1dc59cd931  openbox-3.4.11.2.tar.gz
+00441b53cf14c03566c8e82643544ff9  openbox-3.5.0.tar.gz