Added cloudprint-cups (welcome back to the AUR)

4 files changed, 35 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d31784009f4d..dfbaad6500c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,20 @@
 pkgbase = cloudprint-cups
-	pkgdesc = Google Cloud Print driver for CUPS, allows printing to printers hosted on Google Cloud Print.
-	pkgver = 20160502
-	pkgrel = 2
+	pkgdesc = Google Cloud Print driver for CUPS, allows printing to printers hosted on GCP
+	pkgver = 20160502.r16.g1f27903
+	pkgrel = 3
+	epoch = 1
 	url = https://github.com/simoncadman/CUPS-Cloud-Print
 	install = cloudprint-cups.install
 	arch = any
 	license = GPL3
-	makedepends = cups
+	depends = cups
+	depends = ghostscript
+	depends = imagemagick
 	depends = python2
-	depends = python2-pycups
 	depends = python2-httplib2
+	depends = python2-pycups
 	depends = python2-six
-	provides = cloudprint-cups
-	provides = cupscloudprint
-	conflicts = cloudprint-cups
-	conflicts = cloudprint-cups-git
-	conflicts = cupscloudprint
-	options = !emptydirs
-	source = https://github.com/simoncadman/CUPS-Cloud-Print/archive/20160502.tar.gz
-	md5sums = c8fffd89b94032c562aa43c924b94a17
+	source = cloudprint-cups-1:20160502.r16.g1f27903-3.tar.gz::https://github.com/simoncadman/CUPS-Cloud-Print/archive/capabilities-fix.tar.gz
+	sha256sums = 13ac78b7c6941ac4479621e1594bcc6e23c01e64986cf5c84b00bae621fe27cb
 
 pkgname = cloudprint-cups
-
diff --git a/.gitignore b/.gitignore
index b669a9b7602c..82b3c183d5d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # from https://github.com/github/gitignore/blob/master/ArchLinuxPackages.gitignore
 *.tar
 *.tar.*
+*.rpm
 *.jar
 *.exe
 *.msi
@@ -10,5 +11,4 @@
 *.log.*
 *.sig
 
-pkg/
-src/
+*/
diff --git a/PKGBUILD b/PKGBUILD
index 9747a580b299..a9c42f1ffa55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,33 @@
-# Maintainer: Daniel Peukert <dan.peukert@gmail.com> (based on the PKGBUILD from cloudprint-cups-git by mortzu and zizzfizzix)
-pkgname=cloudprint-cups
-pkgver=20160502
-pkgrel=2
-pkgdesc='Google Cloud Print driver for CUPS, allows printing to printers hosted on Google Cloud Print.'
+# Maintainer: Daniel Peukert <dan.peukert@gmail.com>
+# Contributor: Filipe Laíns (FFY00) <lains@archlinux.org>
+pkgname='cloudprint-cups'
+pkgver='20160502.r16.g1f27903'
+_commit='1f279036fad249efa8a2bca7f8f54adffd3b59c8'
+pkgrel='3'
+epoch='1'
+pkgdesc='Google Cloud Print driver for CUPS, allows printing to printers hosted on GCP'
 arch=('any')
 url='https://github.com/simoncadman/CUPS-Cloud-Print'
 license=('GPL3')
-depends=('python2' 'python2-pycups' 'python2-httplib2' 'python2-six')
-makedepends=('cups')
-provides=('cloudprint-cups' 'cupscloudprint')
-conflicts=('cloudprint-cups' 'cloudprint-cups-git' 'cupscloudprint')
-options=(!emptydirs)
-install=cloudprint-cups.install
-source=("https://github.com/simoncadman/CUPS-Cloud-Print/archive/$pkgver.tar.gz")
-md5sums=('c8fffd89b94032c562aa43c924b94a17')
+depends=('cups' 'ghostscript' 'imagemagick' 'python2' 'python2-httplib2' 'python2-pycups' 'python2-six')
+install="$pkgname.install"
+_branch='capabilities-fix'
+source=("$pkgname-$epoch:$pkgver-$pkgrel.tar.gz::$url/archive/$_branch.tar.gz")
+sha256sums=('13ac78b7c6941ac4479621e1594bcc6e23c01e64986cf5c84b00bae621fe27cb')
+
+_sourcedirectory="CUPS-Cloud-Print-$_branch"
 
 build() {
-	cd "$srcdir/CUPS-Cloud-Print-$pkgver"
-	./configure --prefix /usr
+	cd "$srcdir/$_sourcedirectory/"
+	./configure --prefix '/usr'
 	make
 }
 
 package() {
-	cd "$srcdir/CUPS-Cloud-Print-$pkgver"
-	NOPERMS=1 make DESTDIR="$pkgdir" install
+	cd "$srcdir/$_sourcedirectory/"
+	NOPERMS=1 make DESTDIR="$pkgdir" INSTALL='install -p' install
+	python2 -O -m compileall "$pkgdir/usr/share/$_pkgname"
+
+	install -dm755 "$pkgdir/usr/bin"
+	ln -sf "/usr/share/$_pkgname/setupcloudprint.py" "$pkgdir/usr/bin/setupcloudprint"
 }
diff --git a/cloudprint-cups.install b/cloudprint-cups.install
index 829862e78c1a..330c777b31de 100644
--- a/cloudprint-cups.install
+++ b/cloudprint-cups.install
@@ -1,7 +1,3 @@
-post_install() {
-	echo 'Run "sudo /usr/share/cloudprint-cups/setupcloudprint.py" to set up.'
-}
-
 post_upgrade() {
 	/usr/share/cloudprint-cups/upgrade.py
 }