fix errors

2 files changed, 14 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7fbaa124f807..c8d335041d20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = listera-novelreader-bin
 	pkgdesc = A txt Chinese novel reader, developed based on Qt5 and Dtk5.一个 txt 中文小说阅读器，基于 Qt5 和 Dtk5 开发。
 	pkgver = 1.2.1
-	pkgrel = 4
+	pkgrel = 5
 	url = https://www.listera.top/tag/novelreader
 	arch = x86_64
 	license = GPL3
@@ -12,6 +12,7 @@ pkgbase = listera-novelreader-bin
 	depends = gcc-libs
 	depends = qt5-base
 	depends = dtkgui
+	provides = listera-novelreader=1.2.1
 	conflicts = listera-novelreader
 	source = listera-novelreader-1.2.1.deb::https://gitee.com/lidanger/listera-novelreader/releases/download/v1.2.1/listera-novelreader_1.2.1-3_amd64.deb
 	sha256sums = 74fda48d298a908db84ba2f945c2d72cfc3a8eb7ee4696a3f619f1060dd78ef7
diff --git a/PKGBUILD b/PKGBUILD
index 24553b845d39..a062c3b47d5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,26 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=listera-novelreader-bin
 pkgver=1.2.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A txt Chinese novel reader, developed based on Qt5 and Dtk5.一个 txt 中文小说阅读器，基于 Qt5 和 Dtk5 开发。"
 arch=('x86_64')
 url="https://www.listera.top/tag/novelreader"
 _giteeurl="https://gitee.com/lidanger/listera-novelreader"
 license=('GPL3')
+provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=('hicolor-icon-theme' 'dtkwidget' 'dtkcore' 'glibc' 'gcc-libs' 'qt5-base' 'dtkgui')
 source=("${pkgname%-bin}-${pkgver}.deb::${_giteeurl}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}-3_amd64.deb")
 sha256sums=('74fda48d298a908db84ba2f945c2d72cfc3a8eb7ee4696a3f619f1060dd78ef7')
+prepare() {
+    bsdtar -xf "${srcdir}/data.tar.gz"
+    sed "s|/usr/bin/||g;s|Viewer|Utility;Viewer|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+}
 package() {
-    bsdtar -xf data.tar.gz -C "${pkgdir}"
-    install -Dm755 -d "${pkgdir}/opt"
-    mv "${pkgdir}/usr/share/${pkgname%-bin}" "${pkgdir}/opt"
-    mv "${pkgdir}/usr/bin/${pkgname%-bin}" "${pkgdir}/opt/${pkgname%-bin}"
-    sed "s|/usr/bin|/opt/${pkgname%-bin}|g;s|Viewer;Text;Reader;Novel|Utility|g" -i "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop"
-    rm -rf "${pkgdir}/usr/bin"
+    install -Dm755 "${srcdir}/usr/bin/${pkgname%-bin}" -t "${pkgdir}/opt/${pkgname%-bin}"
+    install -Dm755 -d "${pkgdir}/usr/bin"
+    ln -sf "/opt/${pkgname%-bin}/${pkgname%-bin}" "${pkgdir}/usr/bin/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/usr/share/${pkgname%-bin}/translations/${pkgname%-bin}_zh_CN.qm" -t "${pkgdir}/usr/share/${pkgname%-bin}/translations/"
+    install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
+    install -Dm644 "${srcdir}/usr/share/icons/hicolor/128x128/apps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
 }
\ No newline at end of file