updated to reflect new upstream archive structure

3 files changed, 47 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2ae0b07ab519..7f4ca7a9cd49 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
 pkgbase = edrawmax
 	pkgdesc = All-in-One Diagram Software
 	pkgver = 9.3
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.edrawsoft.cn/edrawmax/
 	arch = x86_64
 	license = custom:"Copyright EdrawSoft 2004-2018; All Rights Reserved."
 	depends = qt5-base
 	options = !strip
 	source = https://www.edrawsoft.com/archives/edrawmax-9-amd64.tar.gz
+	source = edrawmax.desktop
 	sha256sums = 4ddc489dad1cd663a85ac91b5fe9c3263ae58aedbbcaaa690d7737d9b53e68eb
+	sha256sums = b0369cd8b8e2d3826f3bdc3362d6c18b9fdcbfa064625d823bd424c0d83b6b1e
 
 pkgname = edrawmax
 
diff --git a/PKGBUILD b/PKGBUILD
index 828a59065bd8..78ec931e5f9b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: kitech1 <vatic@vivaldi.net>
 pkgname=edrawmax
 pkgver=9.3
-pkgrel=2
+pkgrel=3
 pkgmaver=9
 pkgmaname=EdrawMax
 epoch=
@@ -22,18 +22,11 @@ backup=()
 options=(!strip)
 install=
 changelog=
-source=(https://www.edrawsoft.com/archives/$pkgname-$pkgmaver-amd64.tar.gz)
-sha256sums=('4ddc489dad1cd663a85ac91b5fe9c3263ae58aedbbcaaa690d7737d9b53e68eb')
+source=(https://www.edrawsoft.com/archives/$pkgname-$pkgmaver-amd64.tar.gz edrawmax.desktop)
+sha256sums=('4ddc489dad1cd663a85ac91b5fe9c3263ae58aedbbcaaa690d7737d9b53e68eb' 
+'b0369cd8b8e2d3826f3bdc3362d6c18b9fdcbfa064625d823bd424c0d83b6b1e')
 noextract=()
 
-prepare() {
-  line=37  # head -n 3 file.run to get the line
-  echo "Unpack bash binary..."
-  ls -al
-  tail -n +$line $pkgname-$pkgmaver-64.run > $pkgname-$pkgver.tar.gz
-  rm -f $pkgname-$pkgmaver-64.run
-}
-
 build() {
   echo "Extracting files..."
   tar zxf $pkgname-$pkgmaver-amd64.tar.gz
@@ -41,41 +34,38 @@ build() {
 }
 
 check() {
-  cd "$srcdir/$pkgmaname-$pkgmaver"
+  cd "$srcdir/$pkgname-$pkgmaver-amd64"
 }
 
 package() {
-  cd "$srcdir/$pkgmaname-$pkgmaver"
+  cd "$srcdir/$pkgname-$pkgmaver-amd64"
   mkdir -p "$pkgdir/opt/$pkgmaname-$pkgmaver"
   mv * "$pkgdir/opt/$pkgmaname-$pkgmaver/"
 
   cd "$pkgdir/opt/$pkgmaname-$pkgmaver"
-
-  mkdir -p $pkgdir/usr/share/icon/
   mkdir -p $pkgdir/usr/share/applications/
   mkdir -p $pkgdir/usr/share/mime/packages/
   mkdir -p $pkgdir/usr/share/icons/gnome/scalable/mimetypes/
   mkdir -p $pkgdir/usr/bin/
   cp -f edrawmax.png $pkgdir/usr/share/icons/
-  cp -f edrawmax.desktop $pkgdir/usr/share/applications/
   cp -f edrawmax.xml $pkgdir/usr/share/mime/packages/
   cp -f eddx.svg $pkgdir/usr/share/icons/gnome/scalable/mimetypes/
+  cp -f $srcdir/edrawmax.desktop $pkgdir/usr/share/applications/
   ln -f -s /opt/$pkgmaname-$pkgmaver/$pkgmaname $pkgdir/usr/bin/edrawmax
+}
 
-  mv "lib" "lib.bak"
-  mkdir -p lib
-  cp -a ./lib.bak/libqtitanribbon.so* ./lib/
-  cp -a ./lib.bak/libBaseCore.so* ./lib/
-  cp -a ./lib.bak/libedgraphics.so* ./lib/
-  cp -a ./lib.bak/libObjectModule.so* ./lib/
-  cp -a ./lib.bak/libOSSC.so* ./lib/
-  cp -a ./lib.bak/libImporter.so* ./lib/
-  cp -a ./lib.bak/libExporter.so* ./lib/
+post_install() {
+  update-desktop-database /usr/share/applications
+  update-mime-database /usr/share/mime
+  gtk-update-icon-cache /usr/share/icons/gnome/ -f
+  ldconfig
+}
 
-  rm -fr ./lib.bak
-  rm -f qt.conf
-  rm -fr plugins
-  # rm -fr library sample  # big directory, uncomment for test
+post_upgrade() {
+  update-desktop-database /usr/share/applications
+  update-mime-database /usr/share/mime
+  gtk-update-icon-cache /usr/share/icons/gnome/ -f
+  ldconfig
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/edrawmax.desktop b/edrawmax.desktop
new file mode 100755
index 000000000000..6d0d5bb89a97
--- /dev/null
+++ b/edrawmax.desktop
@@ -0,0 +1,25 @@
+[Desktop Entry]

+Name=EdrawMax

+GenericName=Edraw Max

+Categories=Office;FlowChart;Graphics;2DGraphics;VectorGraphics;

+MimeType=application/x-eddx

+Exec=edrawmax

+Terminal=false

+Type=Application

+Icon=edrawmax

+Encoding=UTF-8

+Hidden=false

+Keywords=EdrawMax;Flowchart;Digram;Graphics;

+Keywords[de]=EdrawMax;Diagramm;

+Keywords[fr]=EdrawMax;Diagramme;

+Keywords[ja]=EdrawMax;図;

+Keywords[es]=EdrawMax;Diagrama;

+Keywords[zh_CN]=EdrawMax;绘图;图;

+Keywords[zh_TW]=EdrawMax;繪圖;圖;

+Comment=All-in-One Diagram Software

+Comment[de]=Integrierte Diagramm Software

+Comment[fr]=Logiciel de diagramme tout-en-un

+Comment[ja]=すべてが揃った作図ソフト

+Comment[es]=Software todo-en-uno de diagrama

+Comment[zh_CN]=全类型综合绘图软件

+Comment[zh_TW]=全類型綜合繪圖軟件