fix errors

2 files changed, 10 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2642fc1a80ec..44013ff79793 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
 pkgbase = moonplayer-appimage
 	pkgdesc = All-in-One video player that can play videos from Youtube, Bilibili etc. as well as local videos.
 	pkgver = 4.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://coslyk.github.io/moonplayer.html
 	arch = x86_64
 	license = GPL3
 	depends = hicolor-icon-theme
 	depends = zlib
 	depends = glibc
+	provides = moonplayer-4.2
+	conflicts = moonplayer
 	options = !strip
 	source = moonplayer-4.2.AppImage::https://github.com/coslyk/moonplayer/releases/download/v4.2/MoonPlayer--x86_64.AppImage
 	sha256sums = 0c0cb1f6ba8acb67e10be566b4cd43aac59b4b18f49e588e940dc35730c7e842
diff --git a/PKGBUILD b/PKGBUILD
index 2bc8bbde8466..85ac8e676d2e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,28 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
-pkgname="moonplayer-appimage"
+pkgname=moonplayer-appimage
 _appname=com.github.coslyk.MoonPlayer
 pkgver=4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="All-in-One video player that can play videos from Youtube, Bilibili etc. as well as local videos."
 arch=("x86_64")
 url="https://coslyk.github.io/moonplayer.html"
 _githuburl="https://github.com/coslyk/moonplayer"
 license=('GPL3')
-conflit=("${pkgname%-appimage}")
+provides=("${pkgname%-appimage}-${pkgver}")
+conflicts=("${pkgname%-appimage}")
 depends=('hicolor-icon-theme' 'zlib' 'glibc')
 options=(!strip)
 _install_path="/opt/appimages"
-source=("${pkgname%-appimage}-${pkgver}.AppImage::${_githuburl}/releases/download/v${pkgver}/MoonPlayer--x86_64.AppImage")
+source=("${pkgname%-appimage}-${pkgver}.AppImage::${_githuburl}/releases/download/v${pkgver}/MoonPlayer--${CARCH}.AppImage")
 sha256sums=('0c0cb1f6ba8acb67e10be566b4cd43aac59b4b18f49e588e940dc35730c7e842')
 prepare() {
     chmod a+x "${srcdir}/${pkgname%-appimage}-${pkgver}.AppImage"
     "${srcdir}/${pkgname%-appimage}-${pkgver}.AppImage" --appimage-extract > /dev/null
-    sed "s|Exec=${pkgname%-appimage}|Exec=${_install_path}/${pkgname%-appimage}.AppImage|g;s|Icon=${_appname}|Icon=${pkgname%-appimage}|g" \
-        -i "${srcdir}/squashfs-root/${_appname}.desktop"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-appimage}-${pkgver}.AppImage" "${pkgdir}/${_install_path}/${pkgname%-appimage}.AppImage"
+    sed "s|Exec=${pkgname%-appimage}|Exec=${_install_path}/${pkgname%-appimage}.AppImage|g;s|Icon=${_appname}|Icon=${pkgname%-appimage}|g" \
+        -i "${srcdir}/squashfs-root/${_appname}.desktop"
     install -Dm644 "${srcdir}/squashfs-root/${_appname}.desktop" "${pkgdir}/usr/share/applications/${pkgname%-appimage}.desktop"
     for _icons in 16x16 24x24 32x32 64x64 128x128;do
         install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/${_icons}/apps/${_appname}.png" \