From 394bf5b713ace236167e5e8562d6c9143619a4b0 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: Apr 17 2008 11:34:08 +0000
Subject: - Update to 3.4.7.1

- Don't require /usr/share/themes

---

diff --git a/.cvsignore b/.cvsignore
index 43553ea..141defc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 setlayout.c
-openbox-3.4.6.1.tar.gz
+openbox-3.4.7.1.tar.gz
diff --git a/openbox-3.4.7.1-autostartdir.patch b/openbox-3.4.7.1-autostartdir.patch
new file mode 100644
index 0000000..d3180c0
--- /dev/null
+++ b/openbox-3.4.7.1-autostartdir.patch
@@ -0,0 +1,12 @@
+diff -up openbox-3.4.7.1/Makefile.in.autostartdir openbox-3.4.7.1/Makefile.in
+--- openbox-3.4.7.1/Makefile.in.autostartdir	2008-04-16 17:37:46.000000000 +0200
++++ openbox-3.4.7.1/Makefile.in	2008-04-16 18:24:22.000000000 +0200
+@@ -479,7 +479,7 @@ pkgconfigdir = $(libdir)/pkgconfig
+ pubincludedir = $(includedir)/openbox/@OB_VERSION@/openbox
+ pixmapdir = $(datadir)/pixmaps
+ xsddir = $(datadir)/openbox
+-secretbindir = $(libdir)/openbox
++secretbindir = $(datadir)/openbox
+ theme = Clearlooks
+ AUTOMAKE_OPTIONS = subdir-objects foreign
+ ACLOCAL_AMFLAGS = -I m4
diff --git a/openbox.spec b/openbox.spec
index d5963b5..c41ca7b 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,5 +1,5 @@
 Name:		openbox
-Version:	3.4.6.1
+Version:	3.4.7.1
 Release:	1%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
@@ -9,9 +9,10 @@ URL:		http://icculus.org/openbox
 Source0:	http://icculus.org/openbox/releases/%{name}-%{version}.tar.gz
 Source1:	http://icculus.org/openbox/tools/setlayout.c
 
+Patch0:		openbox-3.4.7.1-autostartdir.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	%{_datadir}/themes
 Requires:	%{name}-libs = %{version}-%{release}
 
 BuildRequires:	gettext
@@ -61,6 +62,7 @@ The %{name}-libs package contains shared libraries used by %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .autostartdir
 
 
 %build
@@ -71,7 +73,7 @@ sed -ie 's|^hardcode_libdir_flag_spec=.*$|hardcode_libdir_flag_spec=""|g' libtoo
 sed -ie 's|^runpath_var=LD_RUN_PATH$|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
-gcc $RPM_OPT_FLAGS -o setlayout %{SOURCE1} -lX11
+gcc %{optflags} -o setlayout %{SOURCE1} -lX11
 
 %install
 rm -rf %{buildroot}
@@ -94,8 +96,11 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/xdg/%{name}/
 %config(noreplace) %{_sysconfdir}/xdg/%{name}/*
 %{_bindir}/gnome-panel-control
+%{_bindir}/gdm-control
 %{_bindir}/%{name}*
 %{_bindir}/setlayout
+%dir %{_datadir}/openbox
+%{_datadir}/openbox/xdg-autostart
 %{_datadir}/themes/*/
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/gnome/wm-properties/
@@ -120,6 +125,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Apr 17 2008 Miroslav Lichvar <mlichvar@redhat.com> - 3.4.7.1-1
+- Update to 3.4.7.1
+- Don't require /usr/share/themes
+
 * Wed Feb 06 2008 Miroslav Lichvar <mlichvar@redhat.com> - 3.4.6.1-1
 - Update to 3.4.6.1
 
diff --git a/sources b/sources
index 0d50364..fab8364 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 76f263e1550532ae54fd53c3a49b2c71  setlayout.c
-0000c3a72d9fb956128cee7fd27ff19f  openbox-3.4.6.1.tar.gz
+7012f5690264556890a7b812f892beef  openbox-3.4.7.1.tar.gz