Rename package

4 files changed, 55 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8c42567f28c..85615da7abb2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
-pkgbase = xmind
+pkgbase = xmind8
 	pkgdesc = Brainstorming and Mind Mapping Software
-	pkgver = 3.7.9+8update9
+	pkgver = 8.update9
 	pkgrel = 1
 	url = https://www.xmind.net
-	install = xmind.install
+	install = xmind8.install
 	arch = x86_64
 	license = EPL
 	license = LGPL
 	depends = java-runtime>=8
-	optdepends = gtk2: gtk2 or gtk3 must install one
-	optdepends = gtk3: gtk2 or gtk3 must install one
-	optdepends = lame: needed for the feature audio notes
+	optdepends = gtk2: gtk2 or gtk3 must be installed
+	optdepends = gtk3: gtk2 or gtk3 must be installed
+	optdepends = lame: needed for audio notes
 	provides = xmind
+	conflicts = xmind
 	source = https://www.xmind.net/xmind/downloads/xmind-8-update9-linux.zip
 	source = XMind
 	source = xmind.desktop
@@ -19,10 +20,10 @@ pkgbase = xmind
 	source = xmind.png
 	source = xmind_file.png
 	sha256sums = 835f7eaa93e2b7d52f44f02324089363ed65a61e0713e01652871143becb070e
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
+	sha256sums = 0ec1dac54d0bd8e01e7a2219da52cbbf261dfdd3cbdc1cb50650a0803f6ff6de
+	sha256sums = 7d6cfdee51d72626c5d945debb4371ef8d758c8a0c4e5c2b547cbd7e552ac00a
+	sha256sums = cc8dccb4710d924d0f3198770705272bfa222dc6926826c975c881e87f081419
+	sha256sums = ae20c41ebe708603cc303c3241a816a229bcbcc3a2435381a7092783a313b84b
+	sha256sums = 7015cda79ee9844f370687b9532b892ebe607969170e6f3fd414e259b181e5ba
 
-pkgname = xmind
+pkgname = xmind8
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..fb7b19c68b22
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/src
+/pkg
+/*.pkg.tar.*
diff --git a/PKGBUILD b/PKGBUILD
index a103e866e398..3da10a4e0a04 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
-# Maintainer: archplayer
+# Maintainer: KokaKiwi <kokakiwi+aur [at] kokakiwi [dot] net>
+# Contributor: archplayer
 # Contributor: RemiliaForever <remilia AT koumakan DOT cc>
 # Contributor: Felix Yan <felixonmars@gmail.com>
 # Contributor: Christoph Drexler <chrdr at gmx dot at>
 # Contributor: Jelle van der Waa <jellevdwaa@gmail.com>
 
 GTK_VERSION=3
-JAVA_VERSION=8
-# JAVA_PATH='/usr/lib/jvm/default-runtime/bin/java'
+JAVA_PATH='/usr/lib/jvm/java-8-openjdk/bin/java'
 
-pkgname=xmind
-pkgver=3.7.9+8update9
+pkgname=xmind8
+pkgver=8.update9
 pkgrel=1
 pkgdesc="Brainstorming and Mind Mapping Software"
 arch=('x86_64')
@@ -21,61 +21,53 @@ optdepends=(
     'gtk3: gtk2 or gtk3 must be installed'
     'lame: needed for audio notes'
 )
-provides=("$pkgname")
-install=xmind.install
+provides=('xmind')
+conflicts=('xmind')
+install=xmind8.install
 source=(
-    "https://www.xmind.net/xmind/downloads/$pkgname-8-update9-linux.zip"
+    "https://www.xmind.net/xmind/downloads/xmind-${pkgver/./-}-linux.zip"
     'XMind'
     'xmind.desktop'
     'xmind.xml'
     'xmind.png'
     'xmind_file.png'
 )
-sha256sums=(
-    '835f7eaa93e2b7d52f44f02324089363ed65a61e0713e01652871143becb070e'
-    'SKIP'
-    'SKIP'
-    'SKIP'
-    'SKIP'
-    'SKIP'
-)
+sha256sums=('835f7eaa93e2b7d52f44f02324089363ed65a61e0713e01652871143becb070e'
+            '0ec1dac54d0bd8e01e7a2219da52cbbf261dfdd3cbdc1cb50650a0803f6ff6de'
+            '7d6cfdee51d72626c5d945debb4371ef8d758c8a0c4e5c2b547cbd7e552ac00a'
+            'cc8dccb4710d924d0f3198770705272bfa222dc6926826c975c881e87f081419'
+            'ae20c41ebe708603cc303c3241a816a229bcbcc3a2435381a7092783a313b84b'
+            '7015cda79ee9844f370687b9532b892ebe607969170e6f3fd414e259b181e5ba')
 
 package() {
-    mkdir -p ${pkgdir}/usr/share/${pkgname}
-    cp -r ${srcdir}/XMind_amd64   ${pkgdir}/usr/share/${pkgname}/XMind
-    cp -r ${srcdir}/configuration ${pkgdir}/usr/share/${pkgname}/
-    cp -r ${srcdir}/features      ${pkgdir}/usr/share/${pkgname}/
-    cp -r ${srcdir}/plugins       ${pkgdir}/usr/share/${pkgname}/
-    cp ${srcdir}/*.xml            ${pkgdir}/usr/share/${pkgname}/
+    mkdir -p $pkgdir/usr/share/xmind
+    cp -r $srcdir/XMind_amd64   $pkgdir/usr/share/xmind/XMind
+    cp -r $srcdir/configuration $pkgdir/usr/share/xmind/
+    cp -r $srcdir/features      $pkgdir/usr/share/xmind/
+    cp -r $srcdir/plugins       $pkgdir/usr/share/xmind/
+    cp $srcdir/*.xml            $pkgdir/usr/share/xmind/
 
-    mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
-    cp ${srcdir}/{epl-v10,lgpl-3.0}.html ${pkgdir}/usr/share/licenses/${pkgname}/
-    cp ${srcdir}/xpla.txt                ${pkgdir}/usr/share/licenses/${pkgname}/
+    mkdir -p $pkgdir/usr/share/licenses/$pkgname
+    cp $srcdir/{epl-v10,lgpl-3.0}.html $pkgdir/usr/share/licenses/$pkgname/
+    cp $srcdir/xpla.txt                $pkgdir/usr/share/licenses/$pkgname/
 
-    mkdir -p ${pkgdir}/usr/share/fonts/${pkgname}
-    cp -r ${srcdir}/fonts ${pkgdir}/usr/share/fonts/${pkgname}/
+    mkdir -p $pkgdir/usr/share/fonts/xmind
+    cp -r $srcdir/fonts $pkgdir/usr/share/fonts/xmind/
 
-    mkdir -p ${pkgdir}/usr/share/applications
-    cp ${srcdir}/xmind.desktop ${pkgdir}/usr/share/applications/
+    mkdir -p $pkgdir/usr/share/applications
+    cp $srcdir/xmind.desktop $pkgdir/usr/share/applications/
 
-    mkdir -p ${pkgdir}/usr/share/mime/packages
-    cp ${srcdir}/xmind.xml ${pkgdir}/usr/share/mime/packages/
+    mkdir -p $pkgdir/usr/share/mime/packages
+    cp $srcdir/xmind.xml $pkgdir/usr/share/mime/packages/
 
-    mkdir -p ${pkgdir}/usr/share/pixmaps
-    cp ${srcdir}/*.png ${pkgdir}/usr/share/pixmaps/
+    mkdir -p $pkgdir/usr/share/pixmaps
+    cp $srcdir/*.png $pkgdir/usr/share/pixmaps/
 
-    mkdir -p ${pkgdir}/usr/bin
-    cp ${srcdir}/XMind ${pkgdir}/usr/bin/
+    mkdir -p $pkgdir/usr/bin
+    cp $srcdir/XMind $pkgdir/usr/bin/
 
-    sed -i "s|^./configuration$|@user.home/.xmind/configuration|" ${pkgdir}/usr/share/${pkgname}/XMind/XMind.ini
-    sed -i "s|^../workspace$|@user.home/.xmind/workspace|" ${pkgdir}/usr/share/${pkgname}/XMind/XMind.ini
-    if [[ "$GTK_VERSION" != "2" ]]; then
-        sed -i "s|^2$|3|" ${pkgdir}/usr/share/${pkgname}/XMind/XMind.ini
-    fi
-    if [[ "$JAVA_VERSION" != "8" ]]; then
-        echo "--add-modules=java.se.ee" >> ${pkgdir}/usr/share/${pkgname}/XMind/XMind.ini
-    fi
-    if [[ "$JAVA_PATH" != "" ]]; then
-        sed -i "s|^-vmargs$|-vm\n${JAVA_PATH}\n-vmargs|" ${pkgdir}/usr/share/${pkgname}/XMind/XMind.ini
-    fi
+    sed -i "s|^./configuration$|@user.home/.xmind/configuration|" $pkgdir/usr/share/xmind/XMind/XMind.ini
+    sed -i "s|^../workspace$|@user.home/.xmind/workspace|" $pkgdir/usr/share/xmind/XMind/XMind.ini
+    sed -i "s|^2$|$GTK_VERSION|" $pkgdir/usr/share/xmind/XMind/XMind.ini
+    sed -i "s|^-vmargs$|-vm\n$JAVA_PATH\n-vmargs|" $pkgdir/usr/share/xmind/XMind/XMind.ini
 }
diff --git a/xmind.install b/xmind8.install
index 39422f79bd8f..75353c42e52e 100644
--- a/xmind.install
+++ b/xmind8.install
@@ -1,6 +1,6 @@
 post_install() {
     echo '    Try to delete ~/.xmind/ directory if XMind crashes on start.'
-    echo '    Edit PKGBUILD and rebuild the package to change GTK or Java version.'
+    echo '    Edit PKGBUILD and rebuild the package to change GTK version or Java path.'
     echo '    You can also set GTK version in the "/usr/share/xmind/XMind/XMind.ini"'
     echo '    file on the line after "--launcher.GTK_version".'
     echo '    You must add "--add-modules=java.se.ee" line at the end of the file'