[xfce4-netload-plugin] Update to 1.1.0 Add VCS key

[Christoph Wickert]

commit 78cc5a6b09f59fe2dfa6532117ea328e55523766
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Jan 14 15:47:03 2012 -0500

    Update to 1.1.0
    Add VCS key

 .gitignore                |    1 +
 sources                   |    2 +-
 xfce4-netload-plugin.spec |   53 ++++++++++++++++++++++++++++++++------------
 3 files changed, 40 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5aed3a4..eacc4c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xfce4-netload-plugin-0.4.0.tar.bz2
 /xfce4-netload-plugin-1.0.0.tar.bz2
+/xfce4-netload-plugin-1.1.0.tar.bz2
diff --git a/sources b/sources
index e2a1f13..dca9c83 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cab53e8cc2b9bfdf7ffd2230916ca3df  xfce4-netload-plugin-1.0.0.tar.bz2
+19bee8171e7d681cb79539417f0b5917  xfce4-netload-plugin-1.1.0.tar.bz2
diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec
index 66c649f..2ed2ebb 100644
--- a/xfce4-netload-plugin.spec
+++ b/xfce4-netload-plugin.spec
@@ -1,58 +1,81 @@
-%global minor_version 1.0
-
-Name:          xfce4-netload-plugin
-Version:       1.0.0
-Release:       5%{?dist}
-Summary:       Network-load monitor for the Xfce panel
-
-Group:         User Interface/Desktops
-License:       GPLv2+
-URL:           http://goodies.xfce.org/projects/panel-plugins/%{name}
-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.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
-BuildRequires: gettext, intltool
-Requires:      xfce4-panel >= 4.4.0
+%global minor_version 1.1
+
+Name:           xfce4-netload-plugin
+Version:        1.1.0
+Release:        1%{?dist}
+Summary:        Network-load monitor for the Xfce panel
+
+Group:          User Interface/Desktops
+License:        GPLv2+
+URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
+Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2
+#VCS: git:git://git.xfce.org/panel-plugins/xfce4-netload-plugin
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  pkgconfig(libxfce4panel-1.0) >= 4.7.0
+BuildRequires:  pkgconfig(libxfce4ui-1) >= 4.7.0
+BuildRequires:  libxml2-devel
+BuildRequires:  gettext, intltool
+Requires:       xfce4-panel >= 4.7.0
 
 %description
 A network-load monitor plugin for the Xfce panel.
 
+
 %prep
 %setup -q
 
+# use xfce4-panel#s 4.8 paths if possible
+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6
+sed -i 's|panel-plugins|panel/plugins|' panel-plugin/Makefile.*
+%endif
+
 %build
-%configure --disable-static
+%configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
+
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
+
 %postun
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_libexecdir}/xfce4/panel-plugins/%{name}
 %{_datadir}/icons/hicolor/*/*/*
+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6
+%{_libexecdir}/xfce4/panel/plugins/%{name}
+%{_datadir}/xfce4/panel/plugins/*.desktop
+%else
+%{_libexecdir}/xfce4/panel-plugins/%{name}
 %{_datadir}/xfce4/panel-plugins/*.desktop
+%endif
 
 %changelog
+* Sat Jan 14 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-1
+- Update to 1.1.0
+- Add VCS key
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild