From fa7f6fff1dfa83b77e4279e0b815bf55d74d90aa Mon Sep 17 00:00:00 2001
From: Christoph Wickert <cwickert@fedoraproject.org>
Date: Mar 25 2011 10:43:48 +0000
Subject: Update to 3.3.0

Fix Source0 URL
Remove upstreamed patches

---

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-3.2-no-zombies.patch b/xfce4-genmon-plugin-3.2-no-zombies.patch
deleted file mode 100644
index c3e054d..0000000
--- a/xfce4-genmon-plugin-3.2-no-zombies.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/panel-plugin/main.c       2008-03-15 15:38:18.000000000 -0700
-+++ a/panel-plugin/main.c       2008-04-16 12:46:22.000000000 -0700
-@@ -32,6 +32,7 @@ 
- 
- #include <libxfce4util/libxfce4util.h>
- #include <libxfcegui4/dialogs.h>
-+#include <libxfcegui4/xfce-exec.h>
- #include <libxfce4panel/xfce-panel-plugin.h>
- #include <libxfce4panel/xfce-panel-convenience.h>
- 
-@@ -94,10 +95,18 @@ 
- {
-     struct genmon_t *poPlugin = (genmon_t *) p_pvPlugin;
-     struct monitor_t *poMonitor = &(poPlugin->oMonitor);
--    char result[256];
-+    GError *error = NULL;
-+
-+       xfce_exec(poMonitor->onClickCmd, 0, 0, &error);
-+    if (error) {
-+        char first[256];
-+        g_snprintf (first, sizeof(first), _("Could not run \"%s\""), poMonitor->onClickCmd);
-+        xfce_message_dialog (NULL, _("Xfce Panel"), 
-+                             GTK_STOCK_DIALOG_ERROR, first, error->message,
-+                             GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL);
-+        g_error_free (error);
-+    }
- 
--    genmon_SpawnCmd (poMonitor->onClickCmd, result,
--        sizeof (poMonitor->onClickCmd), 0);
- }
- 
- /**************************************************************/
diff --git a/xfce4-genmon-plugin-3.2-underlink.patch b/xfce4-genmon-plugin-3.2-underlink.patch
deleted file mode 100644
index 41f8ab4..0000000
--- a/xfce4-genmon-plugin-3.2-underlink.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- xfce4-genmon-plugin-3.2/panel-plugin/Makefile.am	2007-11-23 15:32:40.000000000 +0000
-+++ xfce4-genmon-plugin-3.2/panel-plugin/Makefile.am.new	2011-01-14 18:13:18.662136456 +0000
-@@ -3,10 +3,12 @@
- 
- xfce4_genmon_plugin_CFLAGS =					\
- 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"			\
--	@LIBXFCE4PANEL_CFLAGS@
-+	@LIBXFCE4PANEL_CFLAGS@					\
-+	@LIBXFCEGUI4_CFLAGS@
- 
- xfce4_genmon_plugin_LDADD =					\
--	@LIBXFCE4PANEL_LIBS@
-+	@LIBXFCE4PANEL_LIBS@					\
-+	@LIBXFCEGUI4_LIBS@
- 
- xfce4_genmon_plugin_SOURCES =	\
- 	main.c			\
---- xfce4-genmon-plugin-3.2/configure.ac	2011-01-14 18:18:53.410130665 +0000
-+++ xfce4-genmon-plugin-3.2/configure.ac.new	2011-01-14 18:18:58.431354545 +0000
-@@ -32,6 +32,7 @@
- 
- dnl configure the panel plugin
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.22])
-+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.22])
- 
- dnl Translations
- XDT_I18N([ca cs en_GB eu fr pl pt_PT sq])
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@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@lists.fedoraproject.org> - 3.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild