summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorlightning11412020-10-31 00:37:28 +0800
committerlightning11412020-10-31 00:37:28 +0800
commitdcd43949d540b6f53027fc4fe71a9b4083bac890 (patch)
treea6f28ada6137e36ed63056e617ceb70f9b0ef6d9
parentbf5fb329fb0aefbb2b01eb649dbd9f8fe7accc8a (diff)
downloadaur-dcd43949d540b6f53027fc4fe71a9b4083bac890.tar.gz
fix conflicts with xmind
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD11
-rw-r--r--xmind-2020.xml (renamed from xmind.xml)0
3 files changed, 12 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4d72a77b2eb2..92372ac44d35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = xmind-2020
pkgdesc = XMind - The most popular mind mapping software
pkgver = 10.2.1
- pkgrel = 2
+ pkgrel = 3
url = https://www.xmind.net/
arch = x86_64
license = custom
@@ -10,8 +10,11 @@ pkgbase = xmind-2020
depends = libxtst
depends = alsa-lib
depends = gtk3
+ provides = xmind
+ provides = xmind-2020
+ conflicts = xmind-2020
source = https://dl3.xmind.net/XMind-2020-for-Linux-amd-64bit-10.2.1-202008051959.deb
- source = xmind.xml
+ source = xmind-2020.xml
sha256sums = SKIP
sha256sums = 833f6f1a7ddd73ea2487a21390e16b57c3fa817a560f385a034efdd1ed754a8d
diff --git a/PKGBUILD b/PKGBUILD
index 9c9892b94ef3..bddb1c44ef10 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,15 +4,16 @@
pkgname=xmind-2020
# the versin is from deb package
pkgver=10.2.1
-pkgrel=2
+pkgrel=3
pkgdesc="XMind - The most popular mind mapping software"
arch=("x86_64")
url="https://www.xmind.net/"
license=('custom')
depends=('libxss' 'nss' 'libxtst' 'alsa-lib' 'gtk3')
-
+provides=('xmind' "$pkgname")
+conflicts=("$pkgname")
source=("https://dl3.xmind.net/XMind-2020-for-Linux-amd-64bit-$pkgver-202008051959.deb"
- 'xmind.xml')
+ 'xmind-2020.xml')
sha256sums=('SKIP'
'833f6f1a7ddd73ea2487a21390e16b57c3fa817a560f385a034efdd1ed754a8d')
@@ -28,7 +29,9 @@ package() {
ln -s "/opt/XMind/xmind" ${pkgdir}/usr/bin/xmind-2020
mkdir -p ${pkgdir}/usr/share/mime/packages
- install -Dm644 xmind.xml ${pkgdir}/usr/share/mime/packages/
+ install -Dm644 xmind-2020.xml ${pkgdir}/usr/share/mime/packages/
+
+ mv ${pkgdir}"/usr/share/applications/xmind.desktop" ${pkgdir}"/usr/share/applications/xmind-2020.desktop"
mkdir -p ${pkgdir}/usr/share/licenses/xmind-2020
cp ${pkgdir}"/opt/XMind/resources/app.asar.unpacked/static/license/"license{-cn,}.pdf ${pkgdir}/usr/share/licenses/xmind-2020/
diff --git a/xmind.xml b/xmind-2020.xml
index 084191d14ff8..084191d14ff8 100644
--- a/xmind.xml
+++ b/xmind-2020.xml