From 16cd6fe42e035530763475fb5e93452d79914c9d Mon Sep 17 00:00:00 2001
From: Andreas Bierfert <andreas.bierfert@lowlatency.de>
Date: Oct 31 2011 18:58:36 +0000
Subject: 1.3.1-2

version upgrade (rhbz#750045)
fixes crash on exit (rhbz#711166)
remove obsoleted gcc46 patch
ship desktop file in applications as well (rhbz#748048)

---

diff --git a/.gitignore b/.gitignore
index 27fcaa8..5fcac40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 fluxbox-1.1.1.tar.bz2
 /fluxbox-1.3.0.tar.bz2
 /fluxbox-1.3.1.tar.bz2
+/fluxbox-1.3.2.tar.bz2
diff --git a/fluxbox-gcc46.patch b/fluxbox-gcc46.patch
deleted file mode 100644
index 90d2689..0000000
--- a/fluxbox-gcc46.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From d28e105075e3ec46515c322ee5dca6967a4cc696 Mon Sep 17 00:00:00 2001
-From: Daniel Diaz<dydyam at gmail dot com>
-Date: Mon, 28  Mar  2011  07:06:01  +0000
-Subject: compile fix: added <cstdlib> to provide declaration for 'size_t' (gcc-4.6.x likes it that way)
-
----
-diff --git a/src/FbTk/LayerItem.hh b/src/FbTk/LayerItem.hh
-index a4cdd49..ad33451 100644
---- a/src/FbTk/LayerItem.hh
-+++ b/src/FbTk/LayerItem.hh
-@@ -26,6 +26,7 @@
- #include "Layer.hh"
- #include "NotCopyable.hh"
- #include <vector>
-+#include <cstdlib> // size_t
- 
- namespace FbTk {
- 
-diff --git a/src/FbTk/MacroCommand.hh b/src/FbTk/MacroCommand.hh
-index 932ecaf..bce2ce4 100644
---- a/src/FbTk/MacroCommand.hh
-+++ b/src/FbTk/MacroCommand.hh
-@@ -26,6 +26,7 @@
- #include "RefCount.hh"
- 
- #include <vector>
-+#include <cstdlib> // size_t
- 
- namespace FbTk {
- 
-diff --git a/src/FbTk/MultLayers.hh b/src/FbTk/MultLayers.hh
-index 62c006f..3da25f6 100644
---- a/src/FbTk/MultLayers.hh
-+++ b/src/FbTk/MultLayers.hh
-@@ -24,6 +24,7 @@
- #define FBTK_MULTLAYERS_HH
- 
- #include <vector>
-+#include <cstdlib> // size_t
- 
- namespace FbTk {
- 
---
-cgit 
diff --git a/fluxbox.desktop b/fluxbox.desktop
index 464911f..9f46290 100644
--- a/fluxbox.desktop
+++ b/fluxbox.desktop
@@ -4,3 +4,4 @@ Comment=Very small and fast window manger
 Comment[pl]=Mały i szybki zarządca okien
 Exec=startfluxbox
 Type=Application
+NoDisplay=true
diff --git a/fluxbox.spec b/fluxbox.spec
index 93bdeac..73e532c 100644
--- a/fluxbox.spec
+++ b/fluxbox.spec
@@ -1,5 +1,5 @@
 Name:           fluxbox
-Version:        1.3.1
+Version:        1.3.2
 Release:        1%{?dist}
 
 Summary:        Window Manager based on Blackbox
@@ -8,7 +8,7 @@ Group:          User Interface/Desktops
 License:        MIT
 URL:            http://fluxbox.sourceforge.net
 
-Source0:        http://sourceforge.net/projects/fluxbox/files/fluxbox/1.3.1/fluxbox-1.3.1.tar.bz2
+Source0:        http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Source3:        fluxbox.desktop
 
 # svn checkout http://fluxbox-xdg-menu.googlecode.com/svn/trunk/ fluxbox-xdg-menu-read-only
@@ -16,14 +16,9 @@ Source4:        fluxbox-xdg-menu-svn13.py
 
 Patch0:         fluxbox-startfluxbox-pulseaudio.patch
 
-# gcc 46 build patch
-# http://git.fluxbox.org/fluxbox.git/commit/?id=d28e105075e3ec46515c322ee5dca6967a4cc696
-# wget http://git.fluxbox.org/fluxbox.git/patch/?id=d28e105075e3ec46515c322ee5dca6967a4cc696
-Patch1:         fluxbox-gcc46.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  imlib2-devel
-BuildRequires:	zlib-devel
+BuildRequires:  zlib-devel
 BuildRequires:  libICE-devel
 BuildRequires:  libSM-devel
 BuildRequires:  libX11-devel
@@ -81,16 +76,16 @@ keys, apps).
 %prep
 %setup -q
 %patch0
-%patch1 -p1 -b .gcc46
 
 %build
-%configure      --enable-xft \
-                --enable-gnome \
-                --enable-xinerama \
-		--enable-imlib2 \
-		--enable-nls \
-		--x-includes=%{_includedir} \
-		--x-libraries=%{_libdir} \
+%configure \
+  --enable-xft \
+  --enable-gnome \
+  --enable-xinerama \
+  --enable-imlib2 \
+  --enable-nls \
+  --x-includes=%{_includedir} \
+  --x-libraries=%{_libdir} \
 
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
@@ -99,12 +94,15 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
-# this is for Fedora Core
+# this is for desktop integration
 mkdir -p %{buildroot}%{_datadir}/xsessions/
+mkdir -p %{buildroot}%{_datadir}/applications/
 install -m 0644 -p %{SOURCE3} %{buildroot}%{_datadir}/xsessions/
+install -m 0644 -p %{SOURCE3} %{buildroot}%{_datadir}/applications/
 install -m 0755 -p %{SOURCE4} %{buildroot}%{_bindir}/fluxbox-xdg-menu
 
 desktop-file-validate %{buildroot}%{_datadir}/xsessions/fluxbox.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/fluxbox.desktop
 
 # fix 388971
 mkdir -p %{buildroot}%{_sysconfdir}
@@ -127,6 +125,7 @@ rm -rf %{buildroot}
 %{_mandir}/man5/*
 %{_datadir}/%{name}
 %{_datadir}/xsessions/fluxbox.desktop
+%{_datadir}/applications/fluxbox.desktop
 
 %files pulseaudio
 %defattr(-,root,root,755)
@@ -139,6 +138,13 @@ rm -rf %{buildroot}
 %{_datadir}/vim/vimfiles/syntax/%{S:fluxmenu.vim}
 
 %changelog
+* Mon Oct 31 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.3.1-2
+- version upgrade (rhbz#750045)
+- fixes crash on exit (rhbz#711166)
+- remove obsoleted gcc46 patch
+- ship desktop file in applications as well (rhbz#748048)
+
 * Mon Feb 28 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.3.1-1
 - version upgrade (including suggestions from #681170)
diff --git a/sources b/sources
index 35d5c53..15d96b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0eaa940a69c0a876a520bb85d67b8bec  fluxbox-1.3.1.tar.bz2
+f95b0bdb9ee41bfac124bd0fc601f248  fluxbox-1.3.2.tar.bz2