main/xfce4-battery-plugin: upgrade to 1.0.0

5 files changed, 16 insertions, 34 deletions

diff --git a/main/xfce4-battery-plugin/APKBUILD b/main/xfce4-battery-plugin/APKBUILD
index 65a1d28b5..1854cab83 100644
--- a/main/xfce4-battery-plugin/APKBUILD
+++ b/main/xfce4-battery-plugin/APKBUILD
@@ -1,31 +1,32 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xfce4-battery-plugin
-pkgver=0.5.1
-pkgrel=2
+pkgver=1.0.0
+pkgrel=0
 pkgdesc="A battery monitor plugin for the Xfce panel"
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
-arch="x86 x86_64"
+arch="all"
 license="GPL-2"
 makedepends="xfce4-panel-dev libxfcegui4-dev perl-xml-parser intltool"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
-source="http://goodies.xfce.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2
-	compile_x86_64.diff
-	$install"
+install=
+source="http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+	"
 
-build ()
-{
+prepare() {
+	cd "$srcdir"/$pkgname-$pkgver
+}
+
+build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	patch -Np1 -i "$srcdir"/compile_x86_64.diff || return 1
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
 		--disable-static
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install
 }
-md5sums="d8a666d85bb3c1dd007b547de4dd7037  xfce4-battery-plugin-0.5.1.tar.bz2
-d9a927bca032e9b10a04046c154243a1  compile_x86_64.diff
-db51db79681eadc47be4932355a77c25  xfce4-battery-plugin.post-install
-db51db79681eadc47be4932355a77c25  xfce4-battery-plugin.post-upgrade
-db51db79681eadc47be4932355a77c25  xfce4-battery-plugin.post-deinstall"
+md5sums="2696307f34f6b9630fcaaea102004e78  xfce4-battery-plugin-1.0.0.tar.bz2"
diff --git a/main/xfce4-battery-plugin/compile_x86_64.diff b/main/xfce4-battery-plugin/compile_x86_64.diff
deleted file mode 100644
index 102db1d95..000000000
--- a/main/xfce4-battery-plugin/compile_x86_64.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h.orig	2008-03-18 20:10:58.000000000 +0100
-+++ xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h	2008-03-18 20:14:45.000000000 +0100
-@@ -17,8 +17,8 @@
-  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
--#include <linux/apm_bios.h>
- #include <sys/types.h>
-+#include <linux/apm_bios.h>
- 
- #define APM_PROC   "/proc/apm"
- #define APM_DEVICE "/dev/apm_bios"
-
diff --git a/main/xfce4-battery-plugin/xfce4-battery-plugin.post-deinstall b/main/xfce4-battery-plugin/xfce4-battery-plugin.post-deinstall
deleted file mode 120000
index ffd189d10..000000000
--- a/main/xfce4-battery-plugin/xfce4-battery-plugin.post-deinstall
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-battery-plugin.post-install
\ No newline at end of file
diff --git a/main/xfce4-battery-plugin/xfce4-battery-plugin.post-install b/main/xfce4-battery-plugin/xfce4-battery-plugin.post-install
deleted file mode 100644
index c523d78da..000000000
--- a/main/xfce4-battery-plugin/xfce4-battery-plugin.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
diff --git a/main/xfce4-battery-plugin/xfce4-battery-plugin.post-upgrade b/main/xfce4-battery-plugin/xfce4-battery-plugin.post-upgrade
deleted file mode 120000
index ffd189d10..000000000
--- a/main/xfce4-battery-plugin/xfce4-battery-plugin.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-battery-plugin.post-install
\ No newline at end of file