From 193d6e363a2635d56321863637190bd84f9e18e1 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: Fri, 8 Jan 2010 11:01:12 +0000
Subject: [PATCH] - Update to 3.4.10

---
 .cvsignore                      |  1 +
 openbox-3.4.10-obxpropman.patch | 11 +++++++++++
 openbox.spec                    | 14 ++++++++------
 sources                         |  1 +
 4 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 openbox-3.4.10-obxpropman.patch

diff --git a/.cvsignore b/.cvsignore
index d9e8e0c..1783f83 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 setlayout.c
 openbox-3.4.9.tar.gz
+openbox-3.4.10.tar.gz
diff --git a/openbox-3.4.10-obxpropman.patch b/openbox-3.4.10-obxpropman.patch
new file mode 100644
index 0000000..55048f8
--- /dev/null
+++ b/openbox-3.4.10-obxpropman.patch
@@ -0,0 +1,11 @@
+diff -up openbox-3.4.10/Makefile.in.obxpropman openbox-3.4.10/Makefile.in
+--- openbox-3.4.10/Makefile.in.obxpropman	2010-01-08 10:34:53.000000000 +0100
++++ openbox-3.4.10/Makefile.in	2010-01-08 11:55:04.000000000 +0100
+@@ -976,6 +976,7 @@ dist_doc_DATA = \
+ 
+ nodist_man_MANS = \
+ 	doc/openbox.1 \
++	doc/obxprop.1 \
+ 	doc/openbox-session.1 \
+ 	doc/openbox-gnome-session.1 \
+ 	doc/openbox-kde-session.1
diff --git a/openbox.spec b/openbox.spec
index 3bdd607..0cdade4 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
-Version:	3.4.9
-Release:	2%{?dist}
+Version:	3.4.10
+Release:	1%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -13,6 +13,7 @@ Source3:	menu.xml
 Source4:	openbox.desktop
 
 Patch0:		openbox-3.4.9-autostartdir.patch
+Patch1:		openbox-3.4.10-obxpropman.patch
 Patch4:		openbox-3.4.7.2-24bit.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,6 +72,7 @@ The %{name}-libs package contains shared libraries used by %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .autostartdir
+%patch1 -p1 -b .obxpropman
 %patch4 -p1 -b .24bit
 
 
@@ -88,10 +90,6 @@ gcc %{optflags} -o setlayout %{SOURCE1} -lX11
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-# avoid conflict with openbabel
-mv %{buildroot}%{_bindir}/ob{,x}prop
-sed -i 's/obpro[pb]/obxprop/g' %{buildroot}%{_sysconfdir}/xdg/%{name}/rc.xml
-
 install setlayout %{buildroot}%{_bindir}
 install -p %{SOURCE2} %{buildroot}%{_datadir}/%{name}/xdg-menu
 sed 's|_XDGMENU_|%{_datadir}/%{name}/xdg-menu|g' < %{SOURCE3} \
@@ -128,6 +126,7 @@ rm -rf %{buildroot}
 %{_datadir}/gnome/wm-properties/
 %{_datadir}/xsessions/%{name}*.desktop
 %{_mandir}/man1/%{name}*.1*
+%{_mandir}/man1/obxprop.1*
 
 %files	libs
 %{_libdir}/libobrender.so.*
@@ -147,6 +146,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 08 2010 Miroslav Lichvar <mlichvar@redhat.com> - 3.4.10-1
+- Update to 3.4.10
+
 * Mon Jan 04 2010 Miroslav Lichvar <mlichvar@redhat.com> - 3.4.9-2
 - Rename obprop to obxprop to avoid conflict with openbabel (#549152)
 
diff --git a/sources b/sources
index 9967ba4..94bb245 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 16ca0d290cae2f4c16a35e9cdfb6f503  setlayout.c
 2f30670f7067e3e17567019d2eef21a0  openbox-3.4.9.tar.gz
+daccf153c7808950313eb00bc250f9bc  openbox-3.4.10.tar.gz