Sync with [extra] gpaste

3 files changed, 35 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d86f4bbea62..9d8643bfba6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,27 @@
+# Generated by mksrcinfo v8
+# Sat Jan  9 20:27:18 UTC 2016
 pkgbase = gpaste-git
-	pkgdesc = Clipboard management system with a GNOME Shell extension
-	pkgver = 3.16.2.1+11+g7b41300
+	pkgdesc = Clipboard management system
+	pkgver = 3.18.2+3+g233f664
 	pkgrel = 1
-	url = https://github.com/Keruspe/GPaste
-	install = gpaste-git.install
+	url = http://www.imagination-land.org/tags/GPaste.html
+	install = gpaste.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = git
 	makedepends = intltool
 	makedepends = vala
-	makedepends = appdata-tools
-	depends = gnome-shell
-	provides = gpaste=3.16.2.1+11+g7b41300
-	source = git://github.com/Keruspe/GPaste.git#branch=gpaste-3.16
-	md5sums = SKIP
+	makedepends = appstream-glib
+	makedepends = gobject-introspection
+	makedepends = gnome-shell
+	makedepends = gnome-control-center
+	depends = gtk3
+	optdepends = wgetpaste: Upload clipboard contents
+	provides = gpaste=3.18.2+3+g233f664
+	options = !emptydirs
+	source = git+https://github.com/Keruspe/GPaste#branch=gpaste-3.18
+	sha256sums = SKIP
 
 pkgname = gpaste-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 65cd918b8ad0..152c1406a5de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,20 @@
 # Contributor: FzerorubigD <Fzerorubigd {AT} GMail {DOT} com>
 
 pkgname=gpaste-git
-pkgver=3.16.2.1+11+g7b41300
+pkgver=3.18.2+3+g233f664
 pkgrel=1
-pkgdesc="Clipboard management system with a GNOME Shell extension"
-url="https://github.com/Keruspe/GPaste"
-arch=(i686 x86_64)
+pkgdesc="Clipboard management system"
+url="http://www.imagination-land.org/tags/GPaste.html"
 license=(GPL3)
-depends=(gnome-shell)
-makedepends=(git intltool vala appdata-tools)
-install=gpaste-git.install
+arch=(i686 x86_64)
+depends=(gtk3)
+makedepends=(git intltool vala appstream-glib gobject-introspection gnome-shell gnome-control-center)
+optdepends=("wgetpaste: Upload clipboard contents")
 provides=("gpaste=$pkgver")
-
-source=("git://github.com/Keruspe/GPaste.git#branch=gpaste-3.16")
-md5sums=('SKIP')
+options=('!emptydirs')
+install=gpaste.install
+source=("git+https://github.com/Keruspe/GPaste#branch=gpaste-3.18")
+sha256sums=('SKIP')
 
 pkgver() {
   cd GPaste
@@ -28,8 +29,10 @@ prepare() {
 
 build() {
   cd GPaste
-  ./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
-    --enable-gnome-shell-extension --enable-systemd
+  ./configure --prefix=/usr \
+    --libexecdir=/usr/lib \
+    --sysconfdir=/etc \
+    --enable-vala
   make
 }
 
@@ -42,7 +45,8 @@ package() {
   cd GPaste
   make DESTDIR="$pkgdir" install
 
-  cd data/completions
-  install -Dm644 gpaste "$pkgdir/usr/share/bash-completion/completions/gpaste"
-  install -Dm644 _gpaste "$pkgdir/usr/share/zsh/site-functions/_gpaste"
+  install -Dm644 data/completions/gpaste-client \
+    "$pkgdir/usr/share/bash-completion/completions/gpaste-client"
+  install -Dm644 data/completions/_gpaste-client \
+    "$pkgdir/usr/share/zsh/site-functions/_gpaste-client"
 }
diff --git a/gpaste-git.install b/gpaste.install
index 7763bd19258b..c19349f7230c 100644
--- a/gpaste-git.install
+++ b/gpaste.install
@@ -1,7 +1,5 @@
 post_install() {
   glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
-  update-desktop-database -q
 }
 
 post_upgrade() {