From e8e793c5f7dc661375fb225e602351a1266e5534 Mon Sep 17 00:00:00 2001
From: Christoph Wickert <cwickert@fedoraproject.org>
Date: Mar 08 2011 17:28:29 +0000
Subject: Include mixer in default panel config (#636227)

Obsolete old plugins (#682491)

---

diff --git a/xfce4-panel.spec b/xfce4-panel.spec
index 5474913..f48d6bf 100644
--- a/xfce4-panel.spec
+++ b/xfce4-panel.spec
@@ -2,15 +2,15 @@
 
 Name:           xfce4-panel
 Version:        4.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Next generation panel for Xfce
 
 Group:          User Interface/Desktops
 License:        GPLv2+ and LGPLv2+
 URL:            http://www.xfce.org/
 Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
-# FIXME: do the patch once upstream has finalized the panel layout
-#Patch0:         xfce4-panel-4.7.6-defaults.patch
+# FIXME: do the patch once SIG has decided about a panel layout
+Patch0:         xfce4-panel-4.8.2-defaults.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  libxfce4ui-devel >= %{xfceversion}
 BuildRequires:  garcon-devel >= 0.1.4
@@ -25,30 +25,33 @@ BuildRequires:  gtk-doc
 Requires:       xfce4-doc
 
 # xfce4-iconbox isn't in Xfce 4.4
-Provides:       xfce4-iconbox = %{version}-%{release}
 Obsoletes:      xfce4-iconbox <= 4.2.3-4.fc6
 # xfce4-systray isn't in Xfce 4.4
-Provides:       xfce4-systray = %{version}-%{release}
 Obsoletes:      xfce4-systray <= 4.2.3-3.fc6
 # xfce4-toys isn't in Xfce 4.4
-Provides:       xfce4-toys = %{version}-%{release}
 Obsoletes:      xfce4-toys <= 4.2.3-3.fc6
 # xfce4-trigger-launcher isn't in Xfce 4.4
-Provides:       xfce4-trigger-launcher = %{version}-%{release}
 Obsoletes:      xfce4-trigger-launcher <= 4.2.3-3.fc6
 # xfce4-showdesktop-plugin isn't in Xfce 4.4
-Provides:       xfce4-showdesktop-plugin = %{version}-%{release}
 Obsoletes:      xfce4-showdesktop-plugin <= 0.4.0-7.fc6
 # xfce4-taskbar-plugin isn't in Xfce 4.4
-Provides:       xfce4-taskbar-plugin = %{version}-%{release}
 Obsoletes:      xfce4-taskbar-plugin <= 0.2.2-7.fc6
 # xfce4-windowlist-plugin isn't in Xfce 4.4
-Provides:       xfce4-windowlist-plugin = %{version}-%{release}
 Obsoletes:      xfce4-windowlist-plugin <= 0.1.0-7.fc6
 # xfce4-xmms-plugin isn't in F11
-Provides:       xfce4-xmms-plugin = 0.5.1-4
 Obsoletes:      xfce4-xmms-plugin <= 0.5.1-3.fc11
 
+# xfce4-volstatus-icon isn't in F15
+Provides:       xfce4-volstatus-icon%{?_isa} = 0.1.0-8
+Obsoletes:      xfce4-volstatus-icon <= 0.1.0-7.fc15
+# xfce4-stopwatch-plugin isn't in F15
+Provides:       xfce4-stopwatch-plugin%{?_isa}-0.2.0-4
+Obsoletes:      xfce4-stopwatch-plugin <= 0.2.0-3.fc15
+# xfce4-xfapplet-plugin isn't in F15
+Provides:       xfce4-xfapplet-plugin%{?_isa} = 0.1.0-11
+Obsoletes:      xfce4-xfapplet-plugin <= 0.1.0-10.fc15
+
+
 %description
 This package includes the panel for the Xfce desktop environment.
 
@@ -67,7 +70,7 @@ plugins for xfce4-panel.
 
 %prep
 %setup -q
-#%patch0 -p1 -b .default
+%patch0 -p1 -b .default
 
 
 %build
@@ -149,6 +152,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_includedir}/xfce4/libxfce4panel-*/
 
 %changelog
+* Tue Mar 08 2011 Christoph Wickert <cwickert@fedoraproject.org> - 4.8.2-2
+- Include mixer in default panel config (#636227)
+- Obsolete old plugins (#682491)
+
 * Fri Feb 25 2011 Christoph Wickert <cwickert@fedoraproject.org> - 4.8.2-1
 - Update to 4.8.2