Improved PKGBUILD based on the cloudprint-cups package

4 files changed, 36 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc81c0480348..55fbd822cbb7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,22 @@
 pkgbase = cloudprint-cups-git
-	pkgdesc = Google Cloud Print driver for CUPS, allows printing to printers hosted on Google Cloud Print. (git version)
-	pkgver = 20160502.r15.gad53b23
-	pkgrel = 3
+	pkgdesc = Google Cloud Print driver for CUPS, allows printing to printers hosted on GCP - git version
+	pkgver = 20160502.r16.g1f27903
+	pkgrel = 1
 	epoch = 1
 	url = https://github.com/simoncadman/CUPS-Cloud-Print
-	install = cloudprint-cups.install
+	install = cloudprint-cups-git.install
 	arch = any
 	license = GPL3
-	makedepends = cups
 	makedepends = git
+	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 = cupscloudprint
-	options = !emptydirs
-	source = cloudprint-cups-git::git://github.com/simoncadman/CUPS-Cloud-Print.git#branch=capabilities-fix
+	source = cloudprint-cups-git::git+https://github.com/simoncadman/CUPS-Cloud-Print#branch=capabilities-fix
 	sha256sums = SKIP
 
 pkgname = cloudprint-cups-git
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 57a130affe03..6eb13326d65f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,41 @@
-# Maintainer: Daniel Peukert <dan.peukert@gmail.com> (original PKGBUILD by mortzu and zizzfizzix)
-pkgname='cloudprint-cups-git'
-pkgver='20160502.r15.gad53b23'
-pkgrel='3'
+# Maintainer: Daniel Peukert <dan.peukert@gmail.com>
+# Contributor: Filipe Laíns (FFY00) <lains@archlinux.org> (cloudprint-cups PKGBUILD)
+# Contributor: mortzu <mortzu@gmx.de>
+# Contributor: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
+_pkgname='cloudprint-cups'
+pkgname="$_pkgname-git"
+pkgver='20160502.r16.g1f27903'
+pkgrel='1'
 epoch='1'
-pkgdesc='Google Cloud Print driver for CUPS, allows printing to printers hosted on Google Cloud Print. (git version)'
+pkgdesc='Google Cloud Print driver for CUPS, allows printing to printers hosted on GCP - git version'
 arch=('any')
 url='https://github.com/simoncadman/CUPS-Cloud-Print'
 license=('GPL3')
-depends=('python2' 'python2-pycups' 'python2-httplib2' 'python2-six')
-makedepends=('cups' 'git')
-provides=('cloudprint-cups' 'cupscloudprint')
-conflicts=('cloudprint-cups' 'cupscloudprint')
-options=(!emptydirs)
-install=cloudprint-cups.install
-source=("$pkgname::git://github.com/simoncadman/CUPS-Cloud-Print.git#branch=capabilities-fix")
+depends=('cups' 'ghostscript' 'imagemagick' 'python2' 'python2-httplib2' 'python2-pycups' 'python2-six')
+makedepends=('git')
+provides=("$_pkgname")
+install="$pkgname.install"
+source=("$pkgname::git+$url#branch=capabilities-fix")
 sha256sums=('SKIP')
 
+_sourcedirectory="$pkgname"
+
 pkgver() {
-	cd "$srcdir/$pkgname"
+	cd "$srcdir/$_sourcedirectory/"
 	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-	cd "$srcdir/$pkgname"
-	./configure --prefix /usr
+	cd "$srcdir/$_sourcedirectory/"
+	./configure --prefix '/usr'
 	make
 }
 
 package() {
-	cd "$srcdir/$pkgname"
+	cd "$srcdir/$_sourcedirectory/"
 	NOPERMS=1 make DESTDIR="$pkgdir" 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-git.install
index 829862e78c1a..97158bea4a1f 100644
--- a/cloudprint-cups.install
+++ b/cloudprint-cups-git.install
@@ -1,5 +1,5 @@
 post_install() {
-	echo 'Run "sudo /usr/share/cloudprint-cups/setupcloudprint.py" to set up.'
+	echo 'Run setupcloudprint to connect to your Google account'
 }
 
 post_upgrade() {