Update to remove conflicts with cadabra1

1 files changed, 9 insertions, 8 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 5fbe883fc3bd..985d007dc042 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,19 @@
 # Maintainer: Tarn Burton <twburton at gmail dot com>
 pkgname='cadabra2-git'
 pkgver=r467.f8f50cf
-pkgrel=2
+pkgrel=3
 pkgdesc="A computer algebra system (pre-release version) designed specifically for the solution of problems encountered in field theory."
 arch=('i686' 'x86_64')
 url="http://cadabra.phi-sci.com/"
 license=('GPL')
-provides=('cadabra')
-conflicts=('cadabra2' 'cadabra' 'cadabra-git')
+provides=('cadabra2')
+conflicts=('cadabra2')
 depends=('python2-matplotlib' 'gtkmm3' 'jsoncpp' 'mathjax' 'boost-libs<1.60.0' 'python2-sympy')
 makedepends=('cmake' 'gcc' 'boost<1.60.0')
-source=("$pkgname::git+https://github.com/kpeeters/cadabra2" "package.patch" "cadabra.desktop")
+source=("$pkgname::git+https://github.com/kpeeters/cadabra2" "package.patch" "cadabra2.desktop")
 md5sums=('SKIP'
          'bae9fc577f0057f24ac51fca61aeac78'
-         'ae0a847eb30b8ef1e3af5f3e67ecc8b4')
+         '3675066ab3a7f79b79f1657477dc03c4')
 install=package.install
 
 
@@ -38,7 +38,8 @@ build() {
 package() {
   cd "${pkgname}/build"
   make DESTDIR="${pkgdir}" install
-  install -Dm644 "${srcdir}/cadabra.desktop" "$pkgdir/usr/share/applications/cadabra.desktop"
-  install -Dm644 ../images/cadabra.png "$pkgdir/usr/share/icons/hicolor/64x64/apps/cadabra.png"
-  install -Dm644 ../images/cadabra.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/cadabra.svg"
+  install -Dm644 "${srcdir}/cadabra2.desktop" "$pkgdir/usr/share/applications/cadabra2.desktop"
+  install -Dm644 ../images/cadabra.png "$pkgdir/usr/share/icons/hicolor/64x64/apps/cadabra2.png"
+  install -Dm644 ../images/cadabra.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/cadabra2.svg"
+  mv "$pkgdir/usr/share/texmf/tex/latex/cadabra" "$pkgdir/usr/share/texmf/tex/latex/cadabra2"
 }