better approach to avoid installing shortcuts to home, the fixes were aplied upstream, so the don't need to be pulled anymore

2 files changed, 5 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6778a10a61b0..1138045366f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed May 25 21:13:53 UTC 2016
+# Thu May 26 17:50:15 UTC 2016
 pkgbase = photivo-hg
 	pkgdesc = Free and open source photo processor
-	pkgver = 1117.5d7d1cc4ef4d
+	pkgver = 1117+.5d7d1cc4ef4d+
 	pkgrel = 1
 	url = http://photivo.org/
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 7818c59ad41c..80853ad04e6d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com>
 pkgname=photivo-hg
-pkgver=1117.5d7d1cc4ef4d
+pkgver=1117+.5d7d1cc4ef4d+
 pkgrel=1
 pkgdesc="Free and open source photo processor"
 arch=('i686' 'x86_64')
@@ -22,8 +22,8 @@ pkgver() {
 prepare() {
   cd "$srcdir/photivo"
 
-  # pull build fixes
-  hg pull -u https://stativ@bitbucket.org/stativ/photivo
+  # avoid installing shortcuts to the home
+  sed '/INSTALLS\s*+=\s*shortcut2/ d' -i photivo.pro
 }
 
 build() {
@@ -37,9 +37,6 @@ build() {
 package() {
   cd "$srcdir/photivo"
 
-  # do not install local the shortcut to the home
-  sed '/^install:/ s|install_shortcut2 ||' -i Makefile
-
   make INSTALL_ROOT="$pkgdir" install
   rm -rf "$pkgdir"/home