[xfce4-systemload-plugin] Update to 1.1.1

[Christoph Wickert]

commit f5e8ffcdb89f53227c8a34b63895a8b581ff1ef7
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun Jul 1 01:24:20 2012 +0200

    Update to 1.1.1
    
    - Enably power-saving interval option through upower

 .gitignore                   |    1 +
 sources                      |    2 +-
 xfce4-systemload-plugin.spec |   64 ++++++++++++++++++++++++++++--------------
 3 files changed, 45 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c7db15e..eab7223 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 xfce4-systemload-plugin-0.4.2.tar.bz2
 /xfce4-systemload-plugin-1.0.0.tar.bz2
 /xfce4-systemload-plugin-1.1.0.tar.bz2
+/xfce4-systemload-plugin-1.1.1.tar.bz2
diff --git a/sources b/sources
index a59fd94..3e15f7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-130ad7befddd8705ca09a98e9cee5c3e  xfce4-systemload-plugin-1.1.0.tar.bz2
+22d48c0883f9d598bce24e81d93e692e  xfce4-systemload-plugin-1.1.1.tar.bz2
diff --git a/xfce4-systemload-plugin.spec b/xfce4-systemload-plugin.spec
index e053bd6..b59c550 100644
--- a/xfce4-systemload-plugin.spec
+++ b/xfce4-systemload-plugin.spec
@@ -1,50 +1,72 @@
-%global minor_version 1.1
-
-Name:          xfce4-systemload-plugin
-Version:       1.1.0
-Release:       2%{?dist}
-Summary:       Systemload monitor for the Xfce panel
-
-Group:         User Interface/Desktops
-License:       BSD
-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.8.0
-BuildRequires: libxfce4ui-devel >= 4.8.0
-BuildRequires: libxml2-devel
-BuildRequires: gettext, intltool
-Requires:      xfce4-panel >= 4.8.0
+# Review: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173668
+
+%global minorversion 1.1
+%if 0%{?fedora} >= 18
+    %global xfceversion 4.10
+%else
+    %global xfceversion 4.8
+%endif
+
+Name:           xfce4-systemload-plugin
+Version:        1.1.1
+Release:        1%{?dist}
+Summary:        Systemload monitor for the Xfce panel
+
+Group:          User Interface/Desktops
+License:        BSD
+URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
+#VCS: git:git://git.xfce.org/panel-plugins/xfce4-systemload-plugin
+Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  libxfce4ui-devel >= 4.7.0
+BuildRequires:  xfce4-panel-devel >= 4.4.0
+BuildRequires:  upower-devel
+BuildRequires:  gettext
+BuildRequires:  intltool
+Requires:       xfce4-panel >= %{xfceversion}
 
 %description
 A system-load monitor plugin for the Xfce panel. It displays the current CPU 
 load, the memory in use, the swap space and the system uptime.
 
+
 %prep
 %setup -q
 
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-chmod -c +x $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/libsystemload.so
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+# remove la file
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+
+# FIXME: make sure debuginfo is generated properly (#795107)
+chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so
+
 %find_lang %{name}
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel/plugins/libsystemload.la
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_libdir}/xfce4/panel/plugins/libsystemload.so
+%{_libdir}/xfce4/panel/plugins/*.so
 %{_datadir}/xfce4/panel/plugins/*.desktop
 
 %changelog
+* Sat Jun 30 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.1-1
+- Update to 1.1.1
+- Enably power-saving interval option through upower
+
 * Tue Apr 24 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.1.0-2
 - Fix -debuginfo.