[arch-commits] Commit in caribou/trunk (PKGBUILD caribou.install)

[Jan de Groot]

    Date: Friday, June 10, 2016 @ 12:27:12
  Author: jgc
Revision: 269278

upgpkg: caribou 0.4.20+12+g31103d1-1

Update to git snapshot, fixes FS#47870, fixes a warning and updates some translations

Modified:
  caribou/trunk/PKGBUILD
Deleted:
  caribou/trunk/caribou.install

-----------------+
 PKGBUILD        |   25 +++++++++++++++++--------
 caribou.install |   13 -------------
 2 files changed, 17 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-10 10:20:05 UTC (rev 269277)
+++ PKGBUILD	2016-06-10 10:27:12 UTC (rev 269278)
@@ -3,7 +3,7 @@
 # Contributor: Adam Hani Schakaki <krzd at krzd.net>
 
 pkgname=caribou
-pkgver=0.4.20
+pkgver=0.4.20+12+g31103d1
 pkgrel=1
 pkgdesc="A text entry and UI navigation application (on-screen keyboard)"
 arch=('i686' 'x86_64')
@@ -10,14 +10,23 @@
 url="http://live.gnome.org/Caribou"
 license=(LGPL)
 depends=(at-spi2-atk python-atspi python-gobject gtk3 libxklavier libgee clutter dconf)
-makedepends=(intltool docbook-xsl gtk2 gobject-introspection vala)
-install=caribou.install
+makedepends=(intltool docbook-xsl gtk2 gobject-introspection vala git gnome-common)
 options=(!emptydirs)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3a6664d5698c2b62a6c1c115743630d339ac237a7324bb354f2e5d55b4bb50d9')
+source=('git://git.gnome.org/caribou#commit=31103d19f57acf556245d82338793c4471ca966a')
+sha256sums=('SKIP')
 
+pkgver() {
+  cd $pkgname
+  git describe --long | sed -e 's/-/+/g' -e 's/^CARIBOU_//' -e 's/_/./g'
+}
+
+prepare() {
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
+}
+
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname
 
   ./configure --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/$pkgname \
@@ -31,12 +40,12 @@
 }
 
 check() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make -k check
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR="$pkgdir" install
 }
 

Deleted: caribou.install
===================================================================
--- caribou.install	2016-06-10 10:20:05 UTC (rev 269277)
+++ caribou.install	2016-06-10 10:27:12 UTC (rev 269278)
@@ -1,13 +0,0 @@
-pkgname=caribou
-
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}