From 81f1b7ae98f8c956713c403d3818c262950a4dd6 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Wed, 30 Jun 2010 04:49:15 +0000
Subject: 2.31.4

---
 .cvsignore       |  2 +-
 gnome-panel.spec | 15 +++++----------
 sources          |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d2ffb67..ed8cf47 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.31.2.tar.bz2
+gnome-panel-2.31.4.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 737b4b4..8a4dacf 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,8 +21,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.31.2
-Release: 4%{?dist}
+Version: 2.31.4
+Release: 1%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-panel
 Source0: http://download.gnome.org/sources/gnome-panel/2.31/%{name}-%{version}.tar.bz2
@@ -124,12 +124,6 @@ Patch47: fix-clock-crash.patch
 
 Patch48: gnome-panel-libs.patch
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=621864
-Patch49: gnome-panel-2.31.2-libm.patch
-
-# upstream fix
-Patch50: 0001-Update-to-GDBus-API-change.patch
-
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -180,8 +174,6 @@ Panel Applets using the libpanel-applet library.
 #%patch45 -p1 -b .icon-padding
 %patch47 -p1 -b .fix-clock-crash
 %patch48 -p1 -b .libs
-%patch49 -p1 -b .libm
-%patch50 -p1 -b .gdbus
 
 cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE4} m4
@@ -375,6 +367,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Jun 30 2010 Matthias Clasen <mclasen@redhat.com> 2.31.4-1
+- Update to 2.31.4
+
 * Mon Jun 21 2010 Matthias Clasen <mclasen@redhat.com> 2.31.2-4
 - Update for GLib api change
 
diff --git a/sources b/sources
index 4c8f3bf..9f47033 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17faacecd3081453b7e3fa8418a46058  gnome-panel-2.31.2.tar.bz2
+aae14afb23201e893ae979fff30bf168  gnome-panel-2.31.4.tar.bz2
-- 
cgit