- update to 3.4.11

- fix linking with --no-add-needed

.cvsignore

@@ -1,2 +1,2 @@
 setlayout.c
-openbox-3.4.10.tar.gz
+openbox-3.4.11.tar.gz

openbox-3.4.10-gnomesession.patch

@@ -1,31 +0,0 @@
-commit 62e36ad0410ce888e7097e7bce5cbbf67b5b6290
-Author: Dana Jansens <danakj@orodu.net>
-Date:   Tue Jan 12 13:59:25 2010 -0500
-
-    Fixes bug #4492 (mis-using the return value of grep -q in openbox-gnome-session script
-
-diff --git a/data/xsession/openbox-gnome-session.in b/data/xsession/openbox-gnome-session.in
-index 6765ae8..1f17edb 100644
---- a/data/xsession/openbox-gnome-session.in
-+++ b/data/xsession/openbox-gnome-session.in
-@@ -37,7 +37,7 @@ else
-   if test -z "$SESSION"; then
-       # if its empty then just run openbox
-       SESSION="[openbox]"
--  elif test -z $(echo "$SESSION" | grep -q openbox); then
-+  elif echo "$SESSION" | grep -q openbox; then
-       # if openbox isn't in the session then append it
-       SESSION="${SESSION%]},openbox]"
-   fi
-diff -up openbox-3.4.10/data/xsession/openbox-gnome-session.in.gnomesession2 openbox-3.4.10/data/xsession/openbox-gnome-session.in
---- openbox-3.4.10/data/xsession/openbox-gnome-session.in.gnomesession2	2010-01-21 14:30:07.000000000 +0100
-+++ openbox-3.4.10/data/xsession/openbox-gnome-session.in	2010-01-21 14:30:47.000000000 +0100
-@@ -37,7 +37,7 @@ else
-   if test -z "$SESSION"; then
-       # if its empty then just run openbox
-       SESSION="[openbox]"
--  elif echo "$SESSION" | grep -q openbox; then
-+  elif ! echo "$SESSION" | grep -q openbox; then
-       # if openbox isn't in the session then append it
-       SESSION="${SESSION%]},openbox]"
-   fi

openbox-3.4.10-obxpropman.patch

@@ -1,11 +0,0 @@
-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

openbox-3.4.11-Xau.patch

@@ -0,0 +1,19 @@
+diff -up openbox-3.4.11/Makefile.in.xau openbox-3.4.11/Makefile.in
+--- openbox-3.4.11/Makefile.in.xau	2010-02-09 15:10:36.000000000 +0100
++++ openbox-3.4.11/Makefile.in	2010-02-09 15:15:01.000000000 +0100
+@@ -763,6 +763,7 @@ tools_gnome_panel_control_gnome_panel_co
+ 	$(X_CFLAGS)
+ 
+ tools_gnome_panel_control_gnome_panel_control_LDADD = \
++	-lXau \
+ 	$(X_LIBS)
+ 
+ tools_gnome_panel_control_gnome_panel_control_SOURCES = \
+@@ -784,6 +785,7 @@ tools_gdm_control_gdm_control_CPPFLAGS =
+ 	$(GLIB_CFLAGS)
+ 
+ tools_gdm_control_gdm_control_LDADD = \
++	-lXau \
+ 	$(X_LIBS) \
+ 	$(GLIB_LIBS)
+ 

openbox.spec

@@ -1,21 +1,19 @@
 Name:		openbox
-Version:	3.4.10
+Version:	3.4.11
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
 License:	GPLv2+
-URL:		http://icculus.org/openbox
+URL:		http://openbox.org
-Source0:	http://icculus.org/openbox/releases/%{name}-%{version}.tar.gz
+Source0:	http://openbox.org/releases/%{name}-%{version}.tar.gz
 Source1:	http://icculus.org/openbox/tools/setlayout.c
 Source2:	xdg-menu
 Source3:	menu.xml
 Source4:	openbox.desktop
 
 Patch0:		openbox-3.4.9-autostartdir.patch
-Patch1:		openbox-3.4.10-obxpropman.patch
+Patch1:		openbox-3.4.11-Xau.patch
-Patch2:		openbox-3.4.10-focuscycle.patch
-Patch3:		openbox-3.4.10-gnomesession.patch
 Patch4:		openbox-3.4.7.2-24bit.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,9 +72,7 @@ The %{name}-libs package contains shared libraries used by %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .autostartdir
-%patch1 -p1 -b .obxpropman
+%patch1 -p1 -b .Xau
-%patch2 -p1 -b .focuscycle -F 2
-%patch3 -p1 -b .gnomesession
 %patch4 -p1 -b .24bit
 
 
@@ -100,7 +96,7 @@ sed 's|_XDGMENU_|%{_datadir}/%{name}/xdg-menu|g' < %{SOURCE3} \
 	> %{buildroot}%{_sysconfdir}/xdg/%{name}/menu.xml
 
 desktop-file-install --vendor="" \
-        --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+        --dir=%{buildroot}%{_datadir}/applications \
         %{SOURCE4}
 
 %find_lang %{name}
@@ -150,6 +146,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Feb 09 2010 Miroslav Lichvar <mlichvar@redhat.com> - 3.4.11-1
+- update to 3.4.11
+- fix linking with --no-add-needed
+
 * Thu Jan 21 2010 Miroslav Lichvar <mlichvar@redhat.com> - 3.4.10-3
 - fix gnome-session script again (#552760)
 

sources

@@ -1,2 +1,2 @@
 16ca0d290cae2f4c16a35e9cdfb6f503  setlayout.c
-daccf153c7808950313eb00bc250f9bc  openbox-3.4.10.tar.gz
+bbbb93c1a4fc8048f2a8ceb4179882a5  openbox-3.4.11.tar.gz