1.10.0-1

2 files changed, 30 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 939a362f0f19..a3b10f91b8cb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mate-power-manager-upower
-	pkgdesc = Power management tool for the MATE desktop, with upower 0.9.23
-	pkgver = 1.8.1
-	pkgrel = 4.1
+	pkgdesc = Power management tool for the MATE desktop (GTK2 version), with upower 0.9.23
+	pkgver = 1.10.0
+	pkgrel = 1
 	url = http://mate-desktop.org
 	install = mate-power-manager.install
 	arch = i686
@@ -16,17 +16,20 @@ pkgbase = mate-power-manager-upower
 	makedepends = yelp-tools
 	depends = dbus-glib
 	depends = dconf
+	depends = gtk2
 	depends = libcanberra
 	depends = libgnome-keyring
 	depends = libnotify
 	depends = libunique
+	depends = mate-desktop>=1.10
 	depends = upower=0.9.23
 	optdepends = mate-panel: Set brightness and inhibit power management from the panel
 	optdepends = yelp: for reading MATE help documents
 	provides = mate-power-manager
 	conflicts = mate-power-manager
-	source = http://pub.mate-desktop.org/releases/1.8/mate-power-manager-1.8.1.tar.xz
-	sha1sums = 0f2d509b8af30e79013de564ea9a0a3d7ccd7c93
+	conflicts = mate-power-manager-gtk3
+	source = http://pub.mate-desktop.org/releases/1.10/mate-power-manager-1.10.0.tar.xz
+	sha1sums = 7540735374e5892c26a9c06f9c973742ef873e74
 
 pkgname = mate-power-manager-upower
 
diff --git a/PKGBUILD b/PKGBUILD
index 83a1f81c0b66..b9a041b1574f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,48 @@
-# Contributor : Martin Wimpress <code@flexion.org>
-# Maintainer: 
+# Maintainer : Martin Wimpress <code@flexion.org>
 
-pkgname=mate-power-manager-upower
-_pkgname=mate-power-manager
-pkgver=1.8.1
-_major=$(echo ${pkgver} | cut -d= -f2 | cut -d. -f1-2)
-pkgrel=4.1
-pkgdesc="Power management tool for the MATE desktop, with upower 0.9.23"
+_ver=1.10
+_pkgbase=mate-power-manager
+pkgname=(${_pkgbase}-upower)
+pkgver=${_ver}.0
+pkgrel=1
+pkgdesc="Power management tool for the MATE desktop (GTK2 version), with upower 0.9.23"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('dbus-glib' 'dconf' 'libcanberra' 'libgnome-keyring' 'libnotify'
-         'libunique' 'upower=0.9.23')
+depends=('dbus-glib' 'dconf' 'gtk2' 'libcanberra' 'libgnome-keyring'
+         'libnotify' 'libunique' 'mate-desktop>=1.10' 'upower=0.9.23')
 makedepends=('docbook2x' 'docbook-xml' 'mate-common' 'mate-panel' 'xmlto' 'yelp-tools')
 optdepends=('mate-panel: Set brightness and inhibit power management from the panel'
             'yelp: for reading MATE help documents')
-conflicts=('mate-power-manager')
-provides=('mate-power-manager')
+source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz")
 groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/${_major}/${_pkgname}-${pkgver}.tar.xz")
-sha1sums=('0f2d509b8af30e79013de564ea9a0a3d7ccd7c93')
-install=${_pkgname}.install
+conflicts=("${_pkgbase}" "${_pkgbase}-gtk3")
+provides=("${_pkgbase}")
+sha1sums=('7540735374e5892c26a9c06f9c973742ef873e74')
+install=${_pkgbase}.install
 
 prepare() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-    #Work around a problem where the .sgml fail to parse.
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
+    #Work around a problem where the .sgml fails to parse.
     sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in
 }
 
 build() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
     ./configure \
         --prefix=/usr \
-        --libexecdir=/usr/lib/${_pkgname} \
+        --libexecdir=/usr/lib/${_pkgbase} \
         --sysconfdir=/etc \
         --localstatedir=/var \
         --sbindir=/usr/bin \
         --enable-applets \
-        --enable-unique
+        --enable-unique \
+        --with-gtk=2.0 \
+        --disable-strict
     make
 }
 
 package() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
     make DESTDIR="${pkgdir}" install
 }