Update cloudprint-cups git install file and build command

4 files changed, 8 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 295aed109a0f..ce68a1c816fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = cloudprint-cups-git
 	pkgdesc = Google Cloud Print driver for CUPS, allows printing to printers hosted on GCP - git version
 	pkgver = 20160502.r16.g1f27903
-	pkgrel = 2
+	pkgrel = 4
 	epoch = 1
 	url = https://github.com/simoncadman/CUPS-Cloud-Print
-	install = cloudprint-cups-git.install
+	install = cloudprint-cups.install
 	arch = any
 	license = GPL3
 	makedepends = git
diff --git a/PKGBUILD b/PKGBUILD
index 67e602aaad0c..b21b50c9397b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 _pkgname='cloudprint-cups'
 pkgname="$_pkgname-git"
 pkgver='20160502.r16.g1f27903'
-pkgrel='2'
+pkgrel='4'
 epoch='1'
 pkgdesc='Google Cloud Print driver for CUPS, allows printing to printers hosted on GCP - git version'
 arch=('any')
@@ -15,7 +15,7 @@ depends=('cups' 'ghostscript' 'imagemagick' 'python2' 'python2-httplib2' 'python
 makedepends=('git')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-install="$pkgname.install"
+install="$_pkgname.install"
 source=("$pkgname::git+$url#branch=capabilities-fix")
 sha256sums=('SKIP')
 
@@ -34,7 +34,7 @@ build() {
 
 package() {
 	cd "$srcdir/$_sourcedirectory/"
-	NOPERMS=1 make DESTDIR="$pkgdir" install
+	NOPERMS=1 make DESTDIR="$pkgdir" INSTALL='install -p' install
 	python2 -O -m compileall "$pkgdir/usr/share/$_pkgname"
 
 	install -dm755 "$pkgdir/usr/bin"
diff --git a/cloudprint-cups-git.install b/cloudprint-cups-git.install
deleted file mode 100644
index 97158bea4a1f..000000000000
--- a/cloudprint-cups-git.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-	echo 'Run setupcloudprint to connect to your Google account'
-}
-
-post_upgrade() {
-	/usr/share/cloudprint-cups/upgrade.py
-}
diff --git a/cloudprint-cups.install b/cloudprint-cups.install
new file mode 100644
index 000000000000..330c777b31de
--- /dev/null
+++ b/cloudprint-cups.install
@@ -0,0 +1,3 @@
+post_upgrade() {
+	/usr/share/cloudprint-cups/upgrade.py
+}