uppkg

2 files changed, 17 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fa3ad72d0c4b..90c421876530 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xde-applets-git
 	pkgdesc = X Desktop Environment System Tray Icons and Dock Apps
-	pkgver = 0.11.r1.gbfecdf4
+	pkgver = 0.12.r1.g04da217
 	pkgrel = 1
 	url = https://github.com/bbidulock/xde-applets
 	arch = i686
@@ -11,20 +11,18 @@ pkgbase = xde-applets-git
 	makedepends = libunique
 	makedepends = xorgproto
 	makedepends = git
-	depends = libsm
+	makedepends = libpackagekit-glib
+	makedepends = cpupower
+	makedepends = upower
+	makedepends = gdk-pixbuf-xlib
 	depends = libwnck+-git
 	depends = libcanberra
 	depends = libnotify
 	depends = lm_sensors
-	depends = libpackagekit-glib
-	depends = cpupower
-	depends = upower
-	depends = gdk-pixbuf-xlib
 	optdepends = xdg-launch-git: launch with recent update and launch notification
-	provides = xde-applets
+	provides = xde-applets=0.12-1
 	conflicts = xde-applets
 	source = xde-applets-git::git+https://github.com/bbidulock/xde-applets.git
 	md5sums = SKIP
 
 pkgname = xde-applets-git
-
diff --git a/PKGBUILD b/PKGBUILD
index ff21c1db9cf6..8fdeec2eced0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,25 @@
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
 
 pkgname=xde-applets-git
-pkgver=0.11.r1.gbfecdf4
+_pkgname=xde-applets
+pkgver=0.12.r1.g04da217
 pkgrel=1
 pkgdesc="X Desktop Environment System Tray Icons and Dock Apps"
 groups=('xde-git')
 arch=('i686' 'x86_64')
-url="https://github.com/bbidulock/xde-applets"
+url="https://github.com/bbidulock/$_pkgname"
 license=('GPL')
-provides=('xde-applets')
-conflicts=('xde-applets')
-depends=('libsm' 'libwnck+-git' 'libcanberra' 'libnotify' 'lm_sensors'
-		'libpackagekit-glib' 'cpupower' 'upower' 'gdk-pixbuf-xlib')
-makedepends=('dbus-glib' 'libunique' 'xorgproto' 'git')
+provides=("${_pkgname}=${pkgver%%.r*}-${pkgrel}")
+conflicts=("${_pkgname}")
+depends=('libwnck+-git' 'libcanberra' 'libnotify' 'lm_sensors')
+makedepends=('dbus-glib' 'libunique' 'xorgproto' 'git' 'libpackagekit-glib' 'cpupower' 'upower' 'gdk-pixbuf-xlib')
 optdepends=('xdg-launch-git: launch with recent update and launch notification')
-source=("$pkgname::git+https://github.com/bbidulock/xde-applets.git")
+source=("$pkgname::git+https://github.com/bbidulock/$_pkgname.git")
 md5sums=('SKIP')
 
 pkgver() {
   cd $pkgname
-  git describe --long --tags | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
+  git describe --long --tags | sed -E 's,^[^0-9]*,,;s,([^-]*-g),r\1,;s,-,.,g'
 }
 
 prepare() {
@@ -32,11 +32,10 @@ build() {
   # gtk2 is using deprecated glib2 declarations
   ./configure CFLAGS="-Wno-deprecated-declarations $CFLAGS"
   # Fight unused direct deps
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+  sed -i -e "s| -shared | $LDFLAGS\0 |g" -e "s|    if test \"\$export_dynamic\" = yes && test -n \"\$export_dynamic_flag_spec\"; then|      func_append compile_command \" $LDFLAGS\"\n      func_append finalize_command \" $LDFLAGS\"\n\0|" libtool
   make CFLAGS="-Wno-deprecated-declarations $CFLAGS"
 }
 
 package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
+  make -C $pkgname DESTDIR="$pkgdir" install
 }