[xfce4-genmon-plugin] Update to 3.4.0

[Christoph Wickert]

commit 0b62edb1ccff5d4f84c20fc856a353b66d1b225f
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun May 13 00:11:24 2012 +0200

    Update to 3.4.0
    
    - Remove upstreamed initialize-timer patch
    - Remove icon hack as utilities-system-monitor is a valid XDG named icon

 .gitignore                                       |    1 +
 sources                                          |    2 +-
 xfce4-genmon-plugin-3.3.0-initialize-timer.patch |   11 -----
 xfce4-genmon-plugin.spec                         |   46 ++++++++++++++--------
 4 files changed, 31 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3e15121..8a4b9e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xfce4-genmon-plugin-3.2.tar.bz2
 /xfce4-genmon-plugin-3.3.0.tar.bz2
+/xfce4-genmon-plugin-3.4.0.tar.bz2
diff --git a/sources b/sources
index 424bdde..76be504 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7c95234dc99efc21bbf9d2b056dd21f9  xfce4-genmon-plugin-3.3.0.tar.bz2
+24108b339bb040ed360266f53a245224  xfce4-genmon-plugin-3.4.0.tar.bz2
diff --git a/xfce4-genmon-plugin.spec b/xfce4-genmon-plugin.spec
index 0f49350..b653d0f 100644
--- a/xfce4-genmon-plugin.spec
+++ b/xfce4-genmon-plugin.spec
@@ -1,24 +1,25 @@
 # Review: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173544
 
-%global minor_version 3.3
+%global minor_version 3.4
+%global xfceversion 4.10
 
 Name:           xfce4-genmon-plugin
-Version:        3.3.0
-Release:        7%{?dist}
+Version:        3.4.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}
+#VCS: git:git://git.xfce.org/panel-plugins/xfce4-genmon-plugin
 Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-3.3.0-initialize-timer.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-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
+BuildRequires:  libxfce4ui-devel >= 4.8.0
+BuildRequires:  xfce4-panel-devel >= 4.8.0
+BuildRequires:  intltool
+BuildRequires:  gettext
+Requires:       xfce4-panel >= %{xfceversion}
 
 %description
 The GenMon plugin cyclically spawns the indicated script/program,
@@ -26,10 +27,8 @@ captures its output and displays it as a string into the panel.
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .show-plugin
-# Fix icon in 'Add new panel item' dialog
-sed -i 's|Icon=xfce-mouse|Icon=system-run|g' panel-plugin/genmon.desktop.in.in
+%setup -q -n %{name}-%{minor_version}
+
 
 %build
 %configure --disable-static
@@ -37,8 +36,15 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+# remove la file
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+# make sure debuginfo is generated properly
+chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so
+
 %find_lang %{name}
 
 
@@ -49,10 +55,16 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_libexecdir}/xfce4/panel-plugins/%{name}
-%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_libdir}/xfce4/panel/plugins/*.so
+%{_datadir}/xfce4/panel/plugins/*.desktop
+
 
 %changelog
+* Sat May 12 2012 Christoph Wickert <cwickert at fedoraproject.org> - 3.4.0-1
+- Update to 3.4.0
+- Remove upstreamed initialize-timer patch
+- Remove icon hack as utilities-system-monitor is a valid XDG named icon
+
 * Sun Apr 15 2012 Kevin Fenzi <kevin at scrye.com> - 3.3.0-7
 - Rebuild for Xfce 4.10(pre2)