Update to 8.2.0.b743f7.0

8 files changed, 30 insertions, 155 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 88824588e27c..5938f8701707 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,16 @@
 pkgbase = astah-uml
-	pkgdesc = Lightweight and easy-to-use UML2.x modeler
-	pkgver = 8.1.0
+	pkgdesc = Lightweight and easy-to-use UML2.x modeler (Trial)
+	pkgver = 8.2.0.b743f7.0
 	pkgrel = 1
-	url = http://astah.net/editions/uml-new
-	install = astah-uml.install
+	url = https://astah.net/products/astah-uml
 	arch = any
 	license = custom
-	makedepends = shared-mime-info
-	makedepends = gtk-update-icon-cache
-	makedepends = desktop-file-utils
-	depends = java-runtime>=8
-	provides = astah_uml
-	conflicts = astah_uml
-	conflicts = astah_community
+	depends = java-runtime=8
+	conflicts = astah-community
 	conflicts = astah-professional
-	source = http://cdn.change-vision.com/files/astah-uml-8_1_0-3ac74f.zip
-	source = astah_uml.desktop
-	source = astah_uml.xml
-	source = astah_uml.png
-	source = astah_splash_uml.png
-	source = LICENSE
-	sha256sums = 4e9c9698cb6b8e5d983a8e28bb6fe10e91099a9deaaf3f27e4f5e8856bb041ac
-	sha256sums = 560cdde7f1bb1fde639a8dd82deab6ee3ae6366d8385e485f32c050f4269592d
-	sha256sums = 0f820a854465a84a0ec718108bee8d96b572f1eb4ab4c558d83c13eb5eb03513
-	sha256sums = 5b02d285410a97e29eb0888b1c095d200bbecc14edc2e9129c281691c3021f49
-	sha256sums = 35f96337f046d3ce25a61db4aa79fe2036e515b090eea597f4b3df081adb9006
-	sha256sums = da5c641c2a9f1e0d616d142ad340b9724b798f55cfb30ba171bee7be2530aa1a
+	options = !emptydirs
+	source = http://cdn.change-vision.com/files/astah-uml-8.2.0.b743f7-0.noarch.rpm
+	sha256sums = e384286a1b7cf0ed592d84be52c473652ff88716972e7235a8a4daddf0018f1f
 
 pkgname = astah-uml
 
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index ae9f663e4f46..000000000000
--- a/LICENSE
+++ /dev/null
@@ -1,47 +0,0 @@
-License Agreement for astah* API Sample Programs

-

-Change Vision, Inc.

-2nd Version as of 4th December, 2013

-

-THIS LICENSE AGREEMENT for astah* API SAMPLE PROGRAMS ("this

-Agreement") is a legal agreement between you (either an

-individual, a firm or a single entity) and Change Vision,

-Inc. (the "Company") for astah* API sample programs (the

-"Samples"). By installing, copying, downloading, accessing,

-or otherwise using the Samples, you agree to be bound by

-the terms and conditions of this Agreement. If you do not

-agree to the terms and conditions of this Agreement, do not

-install or use the Samples.

-

-1. Definition of Term

-astah* API Sample Programs include computer programs,

-associated media, printed materials and online or

-electronic documentation under \api\sample folder of the

-astah* install folder (Astah Professional, Astah UML,

-Astah Community and Astah SysML). 

-

-2. Intellectual Property Rights

-The Company owns copyrights or applicable rights to

-intellectual property with respect to the Samples. Subject

-to the terms and conditions of this Agreement, the Company

-grants you a nonexclusive license to use, copy, and

-distribute the Samples, and to modify the source codes in

-the Samples. No copyrights or applicable rights to

-intellectual property with respect to the Samples hereunder

-may be transferred by the Company or the owner of copyright

-to you. The owner of the copyright retains all applicable

-rights to patent for your invention which is developed by

-consulting the source codes in the Samples. The Company in

-no way warrants performance, results or other contents

-arising out of or in connection with the Samples, nor

-warrants to provide the solution of the problem.

-

-3. Limited Warranty 

-On no event will the Company be liable to you for any

-damages arising out of the use or inability to use the

-Samples.

-

-4. Disclaimer of Warranty

-On no event will the Company be liable to you for any

-damages arising out of the use or inability to use the

-Samples. 
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index ce26197c4328..35e45e3dfcbc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,26 @@
-# Maintainer: Ludovico de Nittis <aasonykk+aur at google mail dot com>
-# Forked from Phillipe Smith <phillipe@archlinux.com.br>
+# Maintainer: Dimitris Kiziridis <ragouel at outlook dot com>
 
 pkgname=astah-uml
-_pkgname=${pkgname/-/_}
-pkgver=8.1.0
-_pkgver=${pkgver//./_}
+pkgver=8.2.0.b743f7.0
 pkgrel=1
-_pkgrel=3ac74f
-pkgdesc="Lightweight and easy-to-use UML2.x modeler"
-arch=("any")
-license=("custom")
-depends=("java-runtime>=8")
-makedepends=("shared-mime-info" "gtk-update-icon-cache" "desktop-file-utils")
-provides=("$_pkgname")
-conflicts=("$_pkgname" "astah_community" "astah-professional")
-install="${pkgname}.install"
-url="http://astah.net/editions/uml-new"
-source=("http://cdn.change-vision.com/files/${pkgname}-${_pkgver}-${_pkgrel}.zip"
-        "${_pkgname}.desktop"
-        "${_pkgname}.xml"
-        "${_pkgname}.png"
-        "astah_splash_uml.png"
-        "LICENSE")
+url='https://astah.net/products/astah-uml'
+pkgdesc='Lightweight and easy-to-use UML2.x modeler (Trial)'
+arch=('any')
+license=('custom')
+depends=('java-runtime=8')
+conflicts=('astah-community' 'astah-professional')
+options=('!emptydirs')
+source=("http://cdn.change-vision.com/files/astah-uml-${pkgver:0:12}-${pkgver:13}.noarch.rpm")
+sha256sums=('e384286a1b7cf0ed592d84be52c473652ff88716972e7235a8a4daddf0018f1f')
 
-sha256sums=('4e9c9698cb6b8e5d983a8e28bb6fe10e91099a9deaaf3f27e4f5e8856bb041ac'
-            '560cdde7f1bb1fde639a8dd82deab6ee3ae6366d8385e485f32c050f4269592d'
-            '0f820a854465a84a0ec718108bee8d96b572f1eb4ab4c558d83c13eb5eb03513'
-            '5b02d285410a97e29eb0888b1c095d200bbecc14edc2e9129c281691c3021f49'
-            '35f96337f046d3ce25a61db4aa79fe2036e515b090eea597f4b3df081adb9006'
-            'da5c641c2a9f1e0d616d142ad340b9724b798f55cfb30ba171bee7be2530aa1a')
-
-package() {         
-    install -Dm755 $srcdir/$_pkgname/astah $pkgdir/usr/bin/astah || return 1
-    install -Dm755 $srcdir/$_pkgname/astah-command.sh $pkgdir/usr/bin/astah-command || return 1
-    install -Dm644 $srcdir/${_pkgname}.desktop $pkgdir/usr/share/applications/${_pkgname}.desktop || return 1
-    install -Dm644 $srcdir/${_pkgname}.xml $pkgdir/usr/share/mime/packages/${_pkgname}.xml || return 1
-    install -Dm644 $srcdir/${_pkgname}.png $pkgdir/usr/share/pixmaps/${_pkgname}.png || return 1
-    install -Dm644 $srcdir/astah_splash_uml.png ${srcdir}/${_pkgname}/astah_splash_uml.png || return 1
-    install -Dm644 $srcdir/LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE || return 1
-    mkdir -p ${pkgdir}/usr/lib/
-    cp -rf ${srcdir}/${_pkgname}/ ${pkgdir}/usr/lib/${pkgname} || return 1
-    chmod +x ${pkgdir}/usr/lib/${pkgname}/astah{,-command.sh}
-    sed -i -r "s|^(ASTAH_HOME=).*|\1/usr/lib/$pkgname|" ${pkgdir}/usr/bin/astah
-}
+package() {
+  cp -aR "${srcdir}/usr" "${pkgdir}"
+  mkdir -p "${pkgdir}/opt/"
+  mv "${pkgdir}/usr/lib/astah_uml" "${pkgdir}/opt/astah-uml"
+  mkdir -p "${pkgdir}/usr/share/doc/astah-uml/"
+  mv "${pkgdir}/opt/astah-uml"/ReferenceManual-* "${pkgdir}/usr/share/doc/astah-uml/"
+  mkdir -p "${pkgdir}/usr/share/licenses/astah-uml"
+  mv "${pkgdir}/opt/astah-uml"/AstahLicenseAgreement-e.txt "${pkgdir}/usr/share/licenses/astah-uml/LICENSE"
+  rm "${pkgdir}/usr/bin/astah-uml"
+  ln -s /opt/astah-uml/astah-uml "${pkgdir}/usr/bin"
+}
\ No newline at end of file
diff --git a/astah-uml.install b/astah-uml.install
deleted file mode 100644
index b3487a34e622..000000000000
--- a/astah-uml.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-    update-desktop-database /usr/share/applications
-    update-mime-database /usr/share/mime
-    gtk-update-icon-cache -t /usr/share/icons/
-    cat <<-EndOfMessage
-
-==> You have to install your license file to /usr/lib/astah-uml/
-      ( you can get one at http://astah.net/pricing )
-
-EndOfMessage
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
-
diff --git a/astah_splash_uml.png b/astah_splash_uml.png
deleted file mode 100644
index 6d3711575657..000000000000
--- a/astah_splash_uml.png
+++ /dev/null
diff --git a/astah_uml.desktop b/astah_uml.desktop
deleted file mode 100644
index 6a1198df4f4b..000000000000
--- a/astah_uml.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=astah* UML
-Comment=UML modeling tool with Mind Mapping
-Comment[ja]=UMLモデリングとマインドマップ描画に特化したライトウェイトなモデリングツールです。
-Exec=astah %U
-Icon=astah_uml.png
-NoDisplay=false
-Terminal=false
-Type=Application
-Categories=Application;Utility;
-MimeType=application/x-astah
diff --git a/astah_uml.png b/astah_uml.png
deleted file mode 100644
index f64fbefe9c7d..000000000000
--- a/astah_uml.png
+++ /dev/null
diff --git a/astah_uml.xml b/astah_uml.xml
deleted file mode 100644
index 1cf07bc718c0..000000000000
--- a/astah_uml.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
- <mime-type type="application/x-astah">
-  <comment>astah* document</comment>
-  <comment xml:lang="ja">astah* ドキュメント</comment>
-  <glob pattern="*.asta"/>
-  <magic priority="50">
-    <match value="PK\003\004" type="string" offset="0"/>
-  </magic>
-  <generic-icon name="astah_uml-doc"/>
- </mime-type>
-</mime-info>