From fa0bbb2f57dfbe3b7d77b67b8eb163a7f23340b3 Mon Sep 17 00:00:00 2001
From: Andreas Bierfert <awjb@fedoraproject.org>
Date: Apr 05 2006 21:19:28 +0000
Subject: - version upgrade

- cleanups

---

diff --git a/.cvsignore b/.cvsignore
index 8c3f795..24a0ce9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-fluxbox-0.9.14.tar.bz2
-artwiz-aleczapka.tar.bz2
+fluxbox-0.9.15.1.tar.bz2
diff --git a/fluxbox-menu.patch b/fluxbox-menu.patch
new file mode 100644
index 0000000..4810521
--- /dev/null
+++ b/fluxbox-menu.patch
@@ -0,0 +1,13 @@
+--- util/startfluxbox.in.orig	2006-03-02 16:10:01.000000000 +0100
++++ util/startfluxbox.in	2006-03-02 16:11:29.000000000 +0100
+@@ -76,6 +76,10 @@
+ # wmsmixer -w &
+ # idesk &
+ 
++if [ -x /usr/bin/fluxbox-xdg-menu ]; then
++ /usr/bin/fluxbox-xdg-menu --with-icons &
++fi
++
+ # And last but not least we start fluxbox.
+ # Because it is the last app you have to run it with ''exec'' before it.
+ 
diff --git a/fluxbox-xdg-menu.py b/fluxbox-xdg-menu.py
index e2fc47e..09ac6c0 100644
--- a/fluxbox-xdg-menu.py
+++ b/fluxbox-xdg-menu.py
@@ -15,8 +15,8 @@ Options:
 """
 
 __author__ = "Rudolf Kastl , Antonio Gomes"
-__version__ = "$Revision: 1.0 $"
-__date__ = "$Date: 2005/04/09 17:46:19 $"
+__version__ = "$Revision: 1.1 $"
+__date__ = "$Date: 2005/11/29 15:56:10 $"
 __license__ = "GPL"
 
 
diff --git a/fluxbox.spec b/fluxbox.spec
index 02a9702..2913d20 100644
--- a/fluxbox.spec
+++ b/fluxbox.spec
@@ -1,6 +1,6 @@
 Name:           fluxbox
-Version:        0.9.14
-Release:        2%{?dist}
+Version:        0.9.15.1
+Release:        1%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -8,18 +8,19 @@ Group:          User Interface/Desktops
 License:        MIT
 URL:            http://fluxbox.sourceforge.net
 
-Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.14.tar.bz2
+Source0:        http://download.sourceforge.net/fluxbox/fluxbox-0.9.15.1.tar.bz2
 Source1:        Xclients.%{name}
 Source2:        FluxBox
 Source3:        fluxbox.desktop
 Source4:        fluxbox-xdg-menu.py
+Patch1:         fluxbox-menu.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildRequires:  imlib2-devel
 BuildRequires:	xorg-x11-devel
 BuildRequires:	zlib-devel
 
-Requires(post): python
+Requires:       pyxdg
 Requires:       artwiz-aleczapka-fonts
 
 %description
@@ -34,6 +35,7 @@ Have a look at the homepage for more info ;)
 
 %prep
 %setup -q
+%patch1
 
 %build
 %configure      --enable-xft \
@@ -63,10 +65,6 @@ install -m 0755 -p %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
 
 install -m 0755 -p %SOURCE4 $RPM_BUILD_ROOT%{_bindir}/fluxbox-xdg-menu
 
-%post
-# New menu-system
-%{_bindir}/fluxbox-xdg-menu --with-icons
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -82,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop
 
 %changelog
+* Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.15.1-1
+- version upgrade
+
 * Thu Nov 10 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.14-2
 - enable nls and imlib2
diff --git a/sources b/sources
index ccbc68b..8f24249 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-7641aaea532841e103e9705bb5b98f62  fluxbox-0.9.14.tar.bz2
-3c7da9a10a84d517e6846b2031950380  artwiz-aleczapka.tar.bz2
+098eb36a09338aabb63b938a5eab9ef6  fluxbox-0.9.15.1.tar.bz2