[xfce4-netload-plugin] Don't use libxecdir if possible

[Christoph Wickert]

commit 3eac6bf1e1dbf23e7b41fc76e6684e75555b5b26
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Fri Mar 9 23:58:58 2012 +0100

    Don't use libxecdir if possible

 xfce4-netload-plugin.spec |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec
index 2ed2ebb..9f2e207 100644
--- a/xfce4-netload-plugin.spec
+++ b/xfce4-netload-plugin.spec
@@ -2,13 +2,16 @@
 
 Name:           xfce4-netload-plugin
 Version:        1.1.0
-Release:        1%{?dist}
+Release:        2%{?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
+Patch0:         %{name}-1.1.0-new-plugin-location.patch
+# contains all translations from translations.xfce.org as of 2012-03-09
+Patch1:         %{name}-1.1.0-update-translations.patch
 #VCS: git:git://git.xfce.org/panel-plugins/xfce4-netload-plugin
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,19 +28,22 @@ A network-load monitor plugin for the Xfce panel.
 %prep
 %setup -q
 
-# use xfce4-panel#s 4.8 paths if possible
+# use new location for xfce4-panel 4.8 plugins (if possible)
 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 6
-sed -i 's|panel-plugins|panel/plugins|' panel-plugin/Makefile.*
+%patch0 -p1 -b .new-location
 %endif
 
+%patch1 -p1 -b .update
+
+
 %build
 %configure
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 %find_lang %{name}
 
 
@@ -57,21 +63,27 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_datadir}/icons/hicolor/*/*/*
+
 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 6
-%{_libexecdir}/xfce4/panel/plugins/%{name}
+%{_libdir}/xfce4/panel/plugins/%{name}
 %{_datadir}/xfce4/panel/plugins/*.desktop
 %else
 %{_libexecdir}/xfce4/panel-plugins/%{name}
 %{_datadir}/xfce4/panel-plugins/*.desktop
 %endif
 
+
 %changelog
+* Fri Mar 09 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-2
+- Don't use libxecdir if possible
+
 * Sat Jan 14 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-1
 - Update to 1.1.0
 - Add VCS key