From 38e85640f5cfe6d7901edea3d1d2f64999c02782 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: Jan 08 2010 11:05:26 +0000
Subject: - Update to 3.4.10


---

diff --git a/.cvsignore b/.cvsignore
index d9e8e0c..603495c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 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 e22bf64..0cdade4 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,5 +1,5 @@
 Name:		openbox
-Version:	3.4.9
+Version:	3.4.10
 Release:	1%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
@@ -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
 
 
@@ -115,7 +117,7 @@ rm -rf %{buildroot}
 %{_bindir}/gnome-panel-control
 %{_bindir}/gdm-control
 %{_bindir}/%{name}*
-%{_bindir}/obprop
+%{_bindir}/obxprop
 %{_bindir}/setlayout
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/%{name}
@@ -124,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.*
@@ -143,6 +146,12 @@ 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)
+
 * Sat Dec 19 2009 Miroslav Lichvar <mlichvar@redhat.com> - 3.4.9-1
 - Update to 3.4.9
 
diff --git a/sources b/sources
index 9967ba4..2fb5b31 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 16ca0d290cae2f4c16a35e9cdfb6f503  setlayout.c
-2f30670f7067e3e17567019d2eef21a0  openbox-3.4.9.tar.gz
+daccf153c7808950313eb00bc250f9bc  openbox-3.4.10.tar.gz