simplified PKGBUILD

3 files changed, 27 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2c40697b1dfa..a23d45b3e949 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = one-tomato
 	pkgdesc = 一个使用dtk实现的番茄钟
 	pkgver = 1.0.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/uiYzzi/one-tomato
 	arch = x86_64
 	license = GPL3
 	makedepends = qconf
 	depends = dtkwidget
 	source = one-tomato-1.0.4.tar.gz::https://github.com/uiYzzi/one-tomato/archive/1.0.4.tar.gz
-	source = one-tomato.desktop::https://raw.githubusercontent.com/uiYzzi/one-tomato/master/dabao/extract/opt/apps/top.yzzi.tomato/entries/applications/top.yzzi.tomato.desktop
+	source = one-tomato.desktop
 	source = one-tomato.svg::https://raw.githubusercontent.com/uiYzzi/one-tomato/master/dabao/extract/opt/apps/top.yzzi.tomato/entries/icons/top.yzzi.tomato.svg
 	sha256sums = 70a53d5e9f85a66863318f70455465b7c32c756ee76d93597fc4e49e5064dcb0
-	sha256sums = 624687f1759b5120ef6b18d56d7c05c03683d100fb36ccaa4198434d99248305
+	sha256sums = 3772f787950809b62534cbf3bdd69c36297ff15c2ffc80517e6456103bf72990
 	sha256sums = 1e8d671a4543852d2f7a7349dda1f27079a593d61a0c34598cab342bc6890ec1
 
 pkgname = one-tomato
diff --git a/PKGBUILD b/PKGBUILD
index 5a6663b08147..38ff19c1cec6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=one-tomato
 pkgver=1.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="一个使用dtk实现的番茄钟"
 arch=('x86_64')
 url="https://github.com/uiYzzi/one-tomato"
@@ -10,16 +10,15 @@ license=('GPL3')
 depends=('dtkwidget')
 makedepends=('qconf')
 source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/uiYzzi/${pkgname}/archive/${pkgver}.tar.gz"
-        "${pkgname}.desktop::https://raw.githubusercontent.com/uiYzzi/one-tomato/master/dabao/extract/opt/apps/top.yzzi.tomato/entries/applications/top.yzzi.tomato.desktop"
+        "${pkgname}.desktop"
         "${pkgname}.svg::https://raw.githubusercontent.com/uiYzzi/one-tomato/master/dabao/extract/opt/apps/top.yzzi.tomato/entries/icons/top.yzzi.tomato.svg")
 sha256sums=('70a53d5e9f85a66863318f70455465b7c32c756ee76d93597fc4e49e5064dcb0'
-            '624687f1759b5120ef6b18d56d7c05c03683d100fb36ccaa4198434d99248305'
+            '3772f787950809b62534cbf3bdd69c36297ff15c2ffc80517e6456103bf72990'
             '1e8d671a4543852d2f7a7349dda1f27079a593d61a0c34598cab342bc6890ec1')
 
 build() {
   cd ${pkgname}-${pkgver}
   
-  mkdir -p build
   qmake ./${pkgname}.pro -spec linux-g++ CONFIG+=qtquickcompiler -o build/
   make -C ./build
 }
@@ -28,15 +27,13 @@ package() {
   cd ${pkgname}-${pkgver}
 
   # binary
-  install -Dm755 build/${pkgname} ${pkgdir}/usr/bin/${pkgname}
+  install -Dm755 build/one-tomato -t ${pkgdir}/usr/bin/
 
-  # desktop enrty
-  install -Dm644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
-  sed -i "s|/opt/apps/top.yzzi.tomato/files/one-tomato|${pkgname}|g"  ${pkgdir}/usr/share/applications/${pkgname}.desktop
-  sed -i "s|top.yzzi.tomato|${pkgname}|g" ${pkgdir}/usr/share/applications/${pkgname}.desktop
+  # desktop entry
+  install -Dm644 ${srcdir}/one-tomato.desktop -t ${pkgdir}/usr/share/applications/
 
-  #  icon
-  install -Dm644 ${srcdir}/${pkgname}.svg ${pkgdir}/usr/share/pixmaps/${pkgname}.svg
+  # icon
+  install -Dm644 ${srcdir}/one-tomato.svg -t  ${pkgdir}/usr/share/pixmaps/
 }
 
 # vim: set sw=2 ts=2 et:
diff --git a/one-tomato.desktop b/one-tomato.desktop
new file mode 100644
index 000000000000..0b7937e543de
--- /dev/null
+++ b/one-tomato.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Categories=Office;
+Comment=OneTomato
+Comment[zh_CN]=一只番茄
+Comment[zh_TW]=壹只柑仔蜜
+Exec=one-tomato
+Icon=one-tomato
+Name=OneTomato
+Name[zh_CN]=一只番茄
+Name[zh_TW]=壹只柑仔蜜
+StartupNotify=true
+StartupWMClass=OneCuteR
+Terminal=false
+Type=Application
+Version=1.0.4
+X-Deepin-Vendor=user-custom