not in opt anymore as it depends on many dirty renames

2 files changed, 6 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef7faa25e22b..679b1d165986 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Sep 23 11:07:30 UTC 2018
+# Sun Sep 23 12:26:15 UTC 2018
 pkgbase = shotwell-git
 	pkgdesc = A digital photo organizer designed for the GNOME desktop environment
 	pkgver = 0.31.4088
-	pkgrel = 3
+	pkgrel = 4
 	url = http://yorba.org/shotwell/
 	arch = x86_64
 	license = LGPL2.1
@@ -26,6 +26,7 @@ pkgbase = shotwell-git
 	depends = gcr
 	depends = libgdata
 	depends = opencv
+	conflicts = shotwell
 	source = shotwell::git+https://gitlab.gnome.org/GNOME/shotwell.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index efeb0a31a10c..1be0be6aa147 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@ pkgname=shotwell-git
 _pkgname=shotwell
 pkgver=0.31.4088
 _pkgver=0.31
-pkgrel=3
+pkgrel=4
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
 arch=('x86_64')
 url="http://yorba.org/shotwell/"
@@ -12,7 +12,7 @@ depends=('libgee' 'webkit2gtk' 'libgexiv2' 'libraw' 'rest'
 	 'gst-plugins-base' 'libgphoto2' 'libgudev'
 	 'gcr' 'libgdata' 'opencv')
 makedepends=('intltool' 'vala>=0.17.2' 'gnome-doc-utils' 'itstool')
-
+conflicts=(shotwell)
 source=("$_pkgname"::'git+https://gitlab.gnome.org/GNOME/shotwell.git')
 sha256sums=('SKIP')
 
@@ -23,7 +23,7 @@ pkgver() {
 
 prepare() {
     cd "$srcdir/$_pkgname"
-    meson build -Dface-detection=true --prefix=/opt/shotwell-git
+    meson build -Dface-detection=true --prefix=/usr
 }
 
 build() {
@@ -34,23 +34,4 @@ build() {
 package() {
     cd "$_pkgname/build"
     DESTDIR="$pkgdir" ninja install
-    
-    install -d -m755 $pkgdir/usr/bin
-    ln -s /opt/$pkgname/bin/shotwell $pkgdir/usr/bin/shotwell-git
-    
-    install -d -m755 $pkgdir/etc/ld.so.conf.d/
-    echo /opt/shotwell-git/lib > $pkgdir/etc/ld.so.conf.d/shotwell-git.conf
-    
-    install -d -m755 $pkgdir/usr/share/applications
-    sed -e 's/shotwell/shotwell\-git/g' \
-  		-i $pkgdir/opt/$pkgname/share/applications/org.gnome.Shotwell.desktop
-    cp $pkgdir/opt/$pkgname/share/applications/org.gnome.Shotwell.desktop $pkgdir/usr/share/applications/org.gnome.Shotwell-git.desktop
-    
-    for dir in `find /usr/share/icons/hicolor/ -mindepth 1 -maxdepth 1 -type d | sed 's|^/[^/]*||'`; do
-    install -d -m755 $pkgdir/usr/$dir/apps
-  	if [ -e $pkgdir/opt/$pkgname/$dir/apps/org.gnome.Shotwell.png ]
-  	then
-	  	install -Dm644 $pkgdir/opt/$pkgname/$dir/apps/org.gnome.Shotwell.png $pkgdir/usr/$dir/apps/org.gnome.Shotwell.png
-	  fi 
-  done
 }