[xfwm4] Update to 4.9.0

[Kevin Fenzi]

commit 6f8d8d610c3622b90cbc143fcbf53719318521d5
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Wed Apr 4 21:11:34 2012 -0600

    Update to 4.9.0

 .gitignore                    |    1 +
 sources                       |    2 +-
 xfwm4-4.9.0-desktop-fix.patch |   36 ++++++++++++++++++++++++++++++++++++
 xfwm4.spec                    |   13 +++++++++----
 4 files changed, 47 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1772f6d..b70a55c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ xfwm4-4.6.2.tar.bz2
 /xfwm4-4.8.1.tar.bz2
 /xfwm4-4.8.2.tar.bz2
 /xfwm4-4.8.3.tar.bz2
+/xfwm4-4.9.0.tar.bz2
diff --git a/sources b/sources
index 1f4558b..1cb9be1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-66cb65797cea8a62563f69b833c7888b  xfwm4-4.8.3.tar.bz2
+ae1963751b0976cc14b1ac3f6928a5fd  xfwm4-4.9.0.tar.bz2
diff --git a/xfwm4-4.9.0-desktop-fix.patch b/xfwm4-4.9.0-desktop-fix.patch
new file mode 100644
index 0000000..68e5d12
--- /dev/null
+++ b/xfwm4-4.9.0-desktop-fix.patch
@@ -0,0 +1,36 @@
+diff -Nur xfwm4-4.9.0.orig/settings-dialogs/xfce-wm-settings.desktop.in xfwm4-4.9.0/settings-dialogs/xfce-wm-settings.desktop.in
+--- xfwm4-4.9.0.orig/settings-dialogs/xfce-wm-settings.desktop.in	2012-03-30 12:43:56.000000000 -0600
++++ xfwm4-4.9.0/settings-dialogs/xfce-wm-settings.desktop.in	2012-04-02 20:48:57.876282606 -0600
+@@ -6,7 +6,7 @@
+ Icon=xfwm4
+ Terminal=false
+ Type=Application
+-Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings;
++Categories=GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings;
+ StartupNotify=true
+ OnlyShowIn=XFCE;
+ X-XfcePluggable=true
+diff -Nur xfwm4-4.9.0.orig/settings-dialogs/xfce-wmtweaks-settings.desktop.in xfwm4-4.9.0/settings-dialogs/xfce-wmtweaks-settings.desktop.in
+--- xfwm4-4.9.0.orig/settings-dialogs/xfce-wmtweaks-settings.desktop.in	2012-03-30 12:43:56.000000000 -0600
++++ xfwm4-4.9.0/settings-dialogs/xfce-wmtweaks-settings.desktop.in	2012-04-02 20:49:03.919310767 -0600
+@@ -6,7 +6,7 @@
+ Icon=wmtweaks
+ Terminal=false
+ Type=Application
+-Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings;
++Categories=GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings;
+ StartupNotify=true
+ OnlyShowIn=XFCE;
+ X-XfcePluggable=true
+diff -Nur xfwm4-4.9.0.orig/settings-dialogs/xfce-workspaces-settings.desktop.in xfwm4-4.9.0/settings-dialogs/xfce-workspaces-settings.desktop.in
+--- xfwm4-4.9.0.orig/settings-dialogs/xfce-workspaces-settings.desktop.in	2012-03-30 12:43:56.000000000 -0600
++++ xfwm4-4.9.0/settings-dialogs/xfce-workspaces-settings.desktop.in	2012-04-02 20:49:11.651346794 -0600
+@@ -6,7 +6,7 @@
+ Icon=xfce4-workspaces
+ Terminal=false
+ Type=Application
+-Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings;
++Categories=GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings;
+ StartupNotify=true
+ OnlyShowIn=XFCE;
+ X-XfcePluggable=true
diff --git a/xfwm4.spec b/xfwm4.spec
index 1daa138..035ada2 100644
--- a/xfwm4.spec
+++ b/xfwm4.spec
@@ -1,8 +1,8 @@
-%global xfceversion 4.8
+%global xfceversion 4.9
 
 Name:           xfwm4
-Version:        4.8.3
-Release:        2%{?dist}
+Version:        4.9.0
+Release:        1%{?dist}
 Summary:        Next generation window manager for Xfce
 
 Group:          User Interface/Desktops
@@ -11,6 +11,8 @@ URL:            http://www.xfce.org/
 Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
 # Use Nodoka Theme
 Patch0:         xfwm4-4.6.1-nodoka.patch
+# Fix desktop categories
+Patch1:         xfwm4-4.9.0-desktop-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfce4ui-devel >= %{xfceversion}
@@ -35,6 +37,7 @@ xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce.
 %if 0%{?fedora}
 %patch0 -p1 -b .nodoka
 %endif
+%patch1 -p1
 
 
 %build
@@ -76,7 +79,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc example.gtkrc-2.0 README TODO COPYING AUTHORS COMPOSITOR
-%doc %{_docdir}/%{name}
 %{_bindir}/xfwm4
 %{_bindir}/xfwm4-settings
 %{_bindir}/xfwm4-tweaks-settings
@@ -90,6 +92,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Mon Apr 02 2012 Kevin Fenzi <kevin at scrye.com> - 4.9.0-1
+- Update to 4.9.0
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild