[xfce4-genmon-plugin] Update to 3.3.0 Fix Source0 URL Remove upstreamed patches

[Christoph Wickert]

commit fa7f6fff1dfa83b77e4279e0b815bf55d74d90aa
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Fri Mar 25 11:43:48 2011 +0100

    Update to 3.3.0
    Fix Source0 URL
    Remove upstreamed patches

 .gitignore                               |    1 +
 sources                                  |    2 +-
 xfce4-genmon-plugin-3.2-no-zombies.patch |   32 ------------------------------
 xfce4-genmon-plugin-3.2-underlink.patch  |   27 -------------------------
 xfce4-genmon-plugin.spec                 |   26 +++++++++++++-----------
 5 files changed, 16 insertions(+), 72 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 689600e..3e15121 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xfce4-genmon-plugin-3.2.tar.bz2
+/xfce4-genmon-plugin-3.3.0.tar.bz2
diff --git a/sources b/sources
index 81a2aa7..424bdde 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f292aa102a87d45207b6a373939a35d  xfce4-genmon-plugin-3.2.tar.bz2
+7c95234dc99efc21bbf9d2b056dd21f9  xfce4-genmon-plugin-3.3.0.tar.bz2
diff --git a/xfce4-genmon-plugin.spec b/xfce4-genmon-plugin.spec
index 71ff07e..48e9106 100644
--- a/xfce4-genmon-plugin.spec
+++ b/xfce4-genmon-plugin.spec
@@ -1,21 +1,20 @@
+%global minor_version 3.3
+
 Name:           xfce4-genmon-plugin
-Version:        3.2
-Release:        7%{?dist}
+Version:        3.3.0
+Release:        1%{?dist}
 Summary:        Generic monitor plugin for the Xfce panel
 
 Group:          User Interface/Desktops
 License:        LGPLv2+
 URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
-# http://bugzilla.xfce.org/show_bug.cgi?id=3896
-Patch0:         xfce4-genmon-plugin-3.2-no-zombies.patch
-# Fixes underlinking against libxfcegui and libgcrypt
-# http://bugzilla.xfce.org/show_bug.cgi?id=7097
-Patch1:		xfce4-genmon-plugin-3.2-underlink.patch
+Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  xfce4-panel-devel >= 4.3.22, libxfcegui4-devel >= 4.3.22, libxml2-devel
-BuildRequires:  gettext, perl(XML::Parser), libtool, xfce4-dev-tools
+BuildRequires:  xfce4-panel-devel >= 4.3.22
+BuildRequires:  libxfcegui4-devel >= 4.3.22
+BuildRequires:  libxml2-devel
+BuildRequires:  gettext, intltool
 Requires:       xfce4-panel >= 4.4.0
 
 %description
@@ -24,8 +23,6 @@ captures its output and displays it as a string into the panel.
 
 %prep
 %setup -q
-%patch0 -p1 -b .zombie-process
-%patch1 -p1 -b .underlink
 
 %build
 # Xfce has its own autotools-running-script thingy, if you use autoreconf
@@ -50,6 +47,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Fri Mar 25 2011 Christoph Wickert <cwickert at fedoraproject.org> - 3.3.0-1
+- Update to 3.3.0
+- Fix Source0 URL
+- Remove upstreamed patches
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild