[xfwm4] Actually do the 4.8.2 update

[Christoph Wickert]

commit d67b8cb4d3a6f03c09f8fc50ec4f3ad705c28127
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Tue Nov 1 01:42:23 2011 +0100

    Actually do the 4.8.2 update

 xfwm4.spec |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)
---
diff --git a/xfwm4.spec b/xfwm4.spec
index d30bb8c..cac658a 100644
--- a/xfwm4.spec
+++ b/xfwm4.spec
@@ -11,13 +11,6 @@ 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 for https://bugzilla.redhat.com/show_bug.cgi?id=670173
-# and https://bugzilla.xfce.org/show_bug.cgi?id=7445
-# taken from http://git.xfce.org/xfce/xfwm4/commit/?id=bf911e27
-Patch1:         xfwm4-4.8.1-relax_resize_wrt_to_size_increments.patch
-# yet another fix for the same problem
-# taken from http://git.xfce.org/xfce/xfwm4/commit/?id=e77b4762
-Patch2:         xfwm4-4.8.1-do_not_enforce_the_size_increment.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfce4ui-devel >= %{xfceversion}
@@ -32,17 +25,16 @@ BuildRequires:  libwnck-devel
 BuildRequires:  xfconf-devel >= %{xfceversion}
 BuildRequires:  desktop-file-utils
 Provides:       firstboot(windowmanager) = xfwm4
-# FIXME
-#Requires:       xfce4-doc
 
 %description
 xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce.
 
 %prep
 %setup -q
+# use Nodoka Theme in Fedora
+%if 0%{?fedora}
 %patch0 -p1 -b .nodoka
-%patch1 -p1 -b .relax_resize
-%patch2 -p1 -b .size_increments
+%endif
 
 
 %build
@@ -100,6 +92,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %changelog
 * Tue Nov 01 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.2-1
 - Update to 4.8.2
+- Remove all upstreamed patches
+- Apply Nodoka theme only in Fedora
 
 * Tue Nov 01 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.1-5
 - Provide window manager for firstboot (#750397)