[xfce4-battery-plugin] - Update to 1.0.0 - Patch for xfce4-panel >= 4.7.7

[Christoph Wickert]

commit 7f439dd60a5f3cee0947b021f357d0e0d4305ae5
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun Jan 9 00:10:40 2011 +0100

    - Update to 1.0.0
    - Patch for xfce4-panel >= 4.7.7

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 xfce4-battery-plugin-0.5.0-fix-ftbfs-2.6.24.patch  |   12 -
 xfce4-battery-plugin-0.5.0-no-battery.patch        |   21 -
 ...-battery-plugin-0.5.1-update-translations.patch | 3911 --------------------
 xfce4-battery-plugin-0.5.1-use-sysfs.patch         |  354 --
 xfce4-battery-plugin-0.5.1-xfce4-panel-4.7.patch   |   12 +
 xfce4-battery-plugin.spec                          |   35 +-
 8 files changed, 31 insertions(+), 4317 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4507e8c..5e591fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xfce4-battery-plugin-0.5.1.tar.bz2
+/xfce4-battery-plugin-1.0.0.tar.bz2
diff --git a/sources b/sources
index 187ac91..e408dad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8a666d85bb3c1dd007b547de4dd7037  xfce4-battery-plugin-0.5.1.tar.bz2
+2696307f34f6b9630fcaaea102004e78  xfce4-battery-plugin-1.0.0.tar.bz2
diff --git a/xfce4-battery-plugin-0.5.1-xfce4-panel-4.7.patch b/xfce4-battery-plugin-0.5.1-xfce4-panel-4.7.patch
new file mode 100644
index 0000000..6e3becc
--- /dev/null
+++ b/xfce4-battery-plugin-0.5.1-xfce4-panel-4.7.patch
@@ -0,0 +1,12 @@
+diff -dur xfce4-battery-plugin-0.5.1.orig/panel-plugin/Makefile.in xfce4-battery-plugin-0.5.1/panel-plugin/Makefile.in
+--- xfce4-battery-plugin-0.5.1.orig/panel-plugin/Makefile.in	2008-09-04 23:06:12.000000000 +0200
++++ xfce4-battery-plugin-0.5.1/panel-plugin/Makefile.in	2011-01-02 19:45:39.554176979 +0100
+@@ -279,7 +279,7 @@
+ #
+ # Desktop file
+ #
+-desktopdir = $(datadir)/xfce4/panel-plugins
++desktopdir = $(datadir)/xfce4/panel/plugins
+ desktop_in_in_files = battmon.desktop.in.in
+ desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec
index e132666..b6a7e6c 100644
--- a/xfce4-battery-plugin.spec
+++ b/xfce4-battery-plugin.spec
@@ -1,25 +1,20 @@
-%global minor_version 0.5
+%global minor_version 1.0
 
 Name:           xfce4-battery-plugin
-Version:        0.5.1
-Release:        5%{?dist}
+Version:        1.0.0
+Release:        1%{?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
-Patch0:         %{name}-0.5.0-fix-ftbfs-2.6.24.patch
-# http://bugzilla.xfce.org/show_bug.cgi?id=3793
-Patch1:         xfce4-battery-plugin-0.5.1-use-sysfs.patch
-# http://bugzilla.xfce.org/show_bug.cgi?id=3546
-Patch2:         xfce4-battery-plugin-0.5.0-no-battery.patch
-# contains all translations from 
-# http://translations.xfce.org/projects/p/xfce4-battery-plugin/c/master/ 
-# as of 2010-12-18
-Patch3:         xfce4-battery-plugin-0.5.1-update-translations.patch
+# needed for xfce4-panel >= 4.7.7
+Patch4:         xfce4-battery-plugin-0.5.1-xfce4-panel-4.7.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel
+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
 
@@ -29,10 +24,7 @@ A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
 
 %prep
 %setup -q
-%patch0 -p1 -b .2.6.24
-%patch1 -p1 -b .use-sysfs
-%patch2 -p0 -b .no-battery
-%patch3 -p1 -b .update-translations
+%patch4 -p1 -b .xfce4-panel-4.7
 
 
 %build
@@ -69,11 +61,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog README
 %{_libexecdir}/xfce4/panel-plugins/%{name}
-%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_datadir}/xfce4/panel/plugins/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Mon Jan 03 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-1
+- Update to 1.0.0
+- Patch for xfce4-panel >= 4.7.7
+
+* Sat Dec 18 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.1-6
+- Rebuild for xfce4-panel 4.7
+
 * Sat Dec 18 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.1-5
 - Use sysfs instead of procfs (bugzilla.xfce.org #3793)
 - Correctly handle case when no battery is present (bugzilla.xfce.org #3546)