[xfce4-battery-plugin] Update to 1.0.2 (Xfce 4.10 final)

[Christoph Wickert]

commit bd9929c9a5f1f2d0ee12ac275dcb9ce65cdfe004
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Mon Apr 30 18:59:03 2012 +0200

    Update to 1.0.2 (Xfce 4.10 final)
    
    - Add VCS key

 .gitignore                |    1 +
 sources                   |    2 +-
 xfce4-battery-plugin.spec |   44 +++++++++++++++++++++++++++++---------------
 3 files changed, 31 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f429ab2..bf9fc23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 xfce4-battery-plugin-0.5.1.tar.bz2
 /xfce4-battery-plugin-1.0.0.tar.bz2
 /xfce4-battery-plugin-1.0.1.tar.bz2
+/xfce4-battery-plugin-1.0.2.tar.bz2
diff --git a/sources b/sources
index d1a5415..7e67640 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad2a1f12ae3e2ea66948c89a1c8a287d  xfce4-battery-plugin-1.0.1.tar.bz2
+4fb65d12928d438273eebbe76bba5d6d  xfce4-battery-plugin-1.0.2.tar.bz2
diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec
index db09afd..254bea3 100644
--- a/xfce4-battery-plugin.spec
+++ b/xfce4-battery-plugin.spec
@@ -1,20 +1,25 @@
-%global minor_version 1.0
+# Review: https://bugzilla.redhat.com/show_bug.cgi?id=173105
+
+%global minorversion 1.0
+%global xfceversion 4.10
 
 Name:           xfce4-battery-plugin
-Version:        1.0.1
+Version:        1.0.2
 Release:        2%{?dist}
 Summary:        Battery 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-diskperf-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:  xfce4-panel-devel >= 4.3.90.2
-BuildRequires:  libxfcegui4-devel >= 4.3.90.2
-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:  gettext
+BuildRequires:  intltool
+Requires:       xfce4-panel >= %{xfceversion}
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -24,16 +29,21 @@ A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
 %setup -q
 
 %build
-%configure --disable-static
+%configure
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-chmod -c +x $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/libbattery.so
+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}
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel/plugins/libbattery.la
 
 
 %post
@@ -52,18 +62,22 @@ 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 COPYING.LIB ChangeLog README
-%{_libdir}/xfce4/panel/plugins/libbattery.so
+%{_libdir}/xfce4/panel/plugins/*.so
 %{_datadir}/xfce4/panel/plugins/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Mon Apr 30 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.2-1
+- Update to 1.0.2 (Xfce 4.10 final)
+- Add VCS key
+
 * Tue Apr 24 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.0.1-2
 - Fix -debuginfo.