easyeda-pro 1.9.29-1

2 files changed, 31 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33b8665b41ff..9e845dd2b630 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = easyeda-pro-electron
 	pkgdesc = EasyEDA Professional Edition. Run with system electron.
-	pkgver = 1.9.28
+	pkgver = 1.9.29
 	pkgrel = 1
 	url = https://pro.easyeda.com/
 	install = easyeda-pro-electron.install
@@ -12,15 +12,14 @@ pkgbase = easyeda-pro-electron
 	provides = easyeda-pro
 	conflicts = easyeda-pro
 	conflicts = easyeda-pro-git
-	conflicts = easyeda-pro
 	conflicts = easyeda-pro-bin
-	source = easyeda-pro-1.9.28.zip::https://image.easyeda.com/files/easyeda-pro-linux-x64-1.9.28.zip
 	source = LICENSE
-	source = easyeda-pro.sh
 	source = easyeda-pro-electron.install
-	sha256sums = da2fb58bb5ce60777b9af3475cd7fd545ea936d5c1ae230c30a169d7f555de80
+	source = easyeda-pro.sh
+	source = easyeda-pro-x86_64-1.9.29.zip::https://image.easyeda.com/files/easyeda-pro-linux-x64-1.9.29.zip
 	sha256sums = c25d162b032c680a34856d65062aa7ffab56a478ee972eeb3e78543d2eb40f74
-	sha256sums = 89289056ed4b5d051280e3a69dfb550b6914f470f201be1ca3b165ddd4f3e435
 	sha256sums = cc1661c75c9366d2fe43c4b864cf81acb9aae7cab505ce21e7de2db3c68cde76
+	sha256sums = 89289056ed4b5d051280e3a69dfb550b6914f470f201be1ca3b165ddd4f3e435
+	sha256sums = 501cbbb6196f77031474d02756d29530c442f6a4720efe908ac791b5d38f7b83
 
 pkgname = easyeda-pro-electron
diff --git a/PKGBUILD b/PKGBUILD
index 292f2edac8a7..7bdbb0c4e1bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer:  Misaka13514 <Misaka13514 at gmail dot com>
+
 pkgname=easyeda-pro-electron
 _pkgname=${pkgname%-electron}
-pkgver=1.9.28
+pkgver=1.9.29
 pkgrel=1
 pkgdesc="EasyEDA Professional Edition. Run with system electron."
 arch=('any')
@@ -9,43 +10,45 @@ url="https://pro.easyeda.com/"
 license=('custom')
 depends=('electron' 'libnotify' 'libappindicator-gtk3')
 makedepends=()
-provides=(${_pkgname})
-conflicts=(${_pkgname} ${_pkgname}-git ${_pkgname} ${_pkgname}-bin)
-install=${pkgname}.install
-source=("${_pkgname}-${pkgver}.zip::https://image.easyeda.com/files/easyeda-pro-linux-x64-${pkgver}.zip"
-        "LICENSE"
-        "${_pkgname}.sh"
-        "${pkgname}.install")
-sha256sums=('da2fb58bb5ce60777b9af3475cd7fd545ea936d5c1ae230c30a169d7f555de80'
-            'c25d162b032c680a34856d65062aa7ffab56a478ee972eeb3e78543d2eb40f74'
+provides=($_pkgname)
+conflicts=($_pkgname $_pkgname-git $_pkgname-bin)
+install=$pkgname.install
+source=("LICENSE"
+        "$pkgname.install"
+        "$_pkgname.sh"
+        "$_pkgname-x86_64-$pkgver.zip::https://image.easyeda.com/files/easyeda-pro-linux-x64-$pkgver.zip")
+sha256sums=('c25d162b032c680a34856d65062aa7ffab56a478ee972eeb3e78543d2eb40f74'
+            'cc1661c75c9366d2fe43c4b864cf81acb9aae7cab505ce21e7de2db3c68cde76'
             '89289056ed4b5d051280e3a69dfb550b6914f470f201be1ca3b165ddd4f3e435'
-            'cc1661c75c9366d2fe43c4b864cf81acb9aae7cab505ce21e7de2db3c68cde76')
+            '501cbbb6196f77031474d02756d29530c442f6a4720efe908ac791b5d38f7b83')
 
 package() {
-    cd ${srcdir}
-    install -Dm755 ${_pkgname}.sh ${pkgdir}/usr/bin/${_pkgname}
-    install -Dm644 LICENSE        ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    cd $srcdir
+    install -Dm755 $_pkgname.sh $pkgdir/usr/bin/$_pkgname
+    install -Dm644 LICENSE      $pkgdir/usr/share/licenses/$pkgname/LICENSE
 
-    cd ${srcdir}/${_pkgname}
-    install -dm755  ${pkgdir}/usr/lib/${_pkgname}
-    cp -dpr --no-preserve=ownership resources ${pkgdir}/usr/lib/${_pkgname}
-    cp -dpr --no-preserve=ownership locales   ${pkgdir}/usr/lib/${_pkgname}
+    cd $srcdir/$_pkgname
+    install -Dm644 EasyEDA-Distribution-License.txt \
+                   $pkgdir/usr/share/licenses/$pkgname/EasyEDA-DLA.txt
+    install -dm755 $pkgdir/usr/lib/$_pkgname
+    cp -dpr --no-preserve=ownership resources $pkgdir/usr/lib/$_pkgname
+    cp -dpr --no-preserve=ownership locales   $pkgdir/usr/lib/$_pkgname
 
     # icon
     local _icon
     for _icon in 16 32 64 128 256 512; do
         install -Dm644 icon/icon_${_icon}x${_icon}.png \
-                       ${pkgdir}/usr/share/icons/hicolor/${_icon}x${_icon}/apps/${_pkgname}.png
+                       $pkgdir/usr/share/icons/hicolor/${_icon}x${_icon}/apps/$_pkgname.png
     done
     install -Dm644 icon/icon_512x512@2x.png \
-                   ${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/${_pkgname}.png
+                   $pkgdir/usr/share/icons/hicolor/1024x1024/apps/$_pkgname.png
 
     # desktop entry
     install -Dm644 easyeda-pro.dkt \
-                   ${pkgdir}/usr/share/applications/${_pkgname}.desktop
+                   $pkgdir/usr/share/applications/$_pkgname.desktop
 
     sed -i 's|/opt/easyeda-pro/icon/icon_128x128.png|easyeda-pro|g' \
-        ${pkgdir}/usr/share/applications/${_pkgname}.desktop
+        $pkgdir/usr/share/applications/$_pkgname.desktop
     sed -i 's|/opt/easyeda-pro/||g' \
-        ${pkgdir}/usr/share/applications/${_pkgname}.desktop
+        $pkgdir/usr/share/applications/$_pkgname.desktop
 }