- project got renamed to astash, update to 6.2.1

- drop legacy mimelnk, add mime.xml instead
- javadoc subpackage for english apidocs

Changed files:
    astah-community.desktop -> 1.8
    astah-community.spec -> 1.24
    astah-community.xml -> 1.1
    x-astah.desktop -> 1.5

4 files changed, 98 insertions, 35 deletions

diff --git a/astah-community.desktop b/astah-community.desktop
index 206d8fa..1494e58 100644
--- a/astah-community.desktop
+++ b/astah-community.desktop
@@ -1,14 +1,13 @@
 [Desktop Entry]
-Name=Jude
+Name=Astah*
 GenericName=UML Modeling Tool
 GenericName[pl]=Narzędzie do modelowania UML
-Comment=Jude
-Comment[pl]=Jude
-Icon=jude
-Exec=jude
+Comment=Astah*
+Icon=astah
+Exec=astah
 Terminal=false
 MultipleArgs=false
 Type=Application
 Categories=Development;ProjectManagement;
-MimeType=application/x-jude;
+MimeType=application/x-astah;
 # vi: encoding=utf-8
diff --git a/astah-community.spec b/astah-community.spec
index b6bc8f6..304f348 100644
--- a/astah-community.spec
+++ b/astah-community.spec
@@ -1,39 +1,49 @@
 # TODO
-# - package API (to examplesdir? subpkg?)
+# - package API to java-astah
+# - repackage to have default opener xdg-open instead of firefox?
+#
+# Conditional build:
+%bcond_without	javadoc		# don't build javadoc
+
 %define		codename	community
 %define		ver		%(echo %{version} | tr . _)
 %include	/usr/lib/rpm/macros.java
 Summary:	A New Java/UML Object-Oriented Design Tool
 Summary(pl.UTF-8):	Narzędzie wspomagające projektowanie oprogramowania w UML
-Name:		jude
-Version:	5.5
-Release:	1
+Name:		astah
+Version:	6.2.1
+Release:	0.6
 # non-distributable, can be used for free upon restrictions and registration
-License:	Proprietary (see http://jude.change-vision.com/jude-web/notes/ProductLicenseAgreement.html)
+# http://astah.change-vision.com/en/product/astah-eula.html
+License:	Astah* EULA
 Group:		Applications/Engineering
-Source0:	http://jude-users.com/edujjude/%{name}-community-%{ver}.zip
-# NoSource0-md5:	90549e57d30ff0e818b8bdd8475ab8dc
+# Source0Download:	https://members.change-vision.com/members/files/astah_community/%{ver}/astah-community-%{ver}.zip
+Source0:	http://jude-users.com/edujjude/%{name}-%{codename}-%{ver}.zip
+# NoSource0-md5:	7323ea7b751a6bd39f0dd906cdf58ca4
 Source1:	%{name}.desktop
-Source2:	x-%{name}.desktop
+Source2:	%{name}.xml
 Source3:	%{name}-icon.png
 NoSource:	0
-URL:		http://jude-users.com/en/
+URL:		http://astah.change-vision.com/en/product/astah-community.html
 BuildRequires:	rpm-javaprov
-BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	rpmbuild(macros) >= 1.311
+Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	shared-mime-info
 BuildRequires:	unzip
 Requires:	jre-X11
+Obsoletes:	jude
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Jude is a new tool which supports your object-oriented software
+Astah is a new tool which supports your object-oriented software
 designing in JavaTM and UML1.4 (Unified Modeling Language).
 
 This package contains Community version, which is freely usable upon
 some restrictions after registration on vendor site.
 
 %description -l pl.UTF-8
-Jude jest nowym narzędziem wspomagającym zorientowane obiektowo
+Astah jest nowym narzędziem wspomagającym zorientowane obiektowo
 projektowanie oprogramowania w JavaTM i UML1.4 (Unified Modeling
 Language).
 
@@ -41,36 +51,84 @@ Ten pakiet zawiera wersję społecznościową, której można używać bez
 opłat pod pewnymi ograniczenami, po uprzedniej rejestracji na stronie
 producenta.
 
+%package javadoc
+Summary:	Online manual for astah
+Summary(pl.UTF-8):	Dokumentacja online do astah
+Group:		Documentation
+Requires:	jpackage-utils
+
+%description javadoc
+Documentation for astah.
+
+%description javadoc -l pl.UTF-8
+Dokumentacja do astah.
+
+%description javadoc -l fr.UTF-8
+Javadoc pour astah.
+
 %prep
 %setup -q -n %{name}_%{codename}
 
+cat <<'EOF' > %{name}.sh
+#!/bin/sh
+exec java -Xms16m -Xmx512m -Xss2m -jar %{_datadir}/%{name}/astah-%{codename}.jar ${1:+"$@"}
+EOF
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}}
 
-cat <<'EOF' > $RPM_BUILD_ROOT%{_bindir}/%{name}
-#!/bin/sh
-exec java -Xms16m -Xmx512m -Xss2m -jar %{_datadir}/%{name}/jude-%{codename}.jar ${1:+"$@"}
-EOF
-cp -a jude-%{codename}.jar *.jude $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p %{name}.sh $RPM_BUILD_ROOT%{_bindir}/%{name}
+cp -a astah-%{codename}.jar $RPM_BUILD_ROOT%{_datadir}/%{name}
+
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a *.asta $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_datadir}/mimelnk/application,%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_datadir}/mime/packages,%{_pixmapsdir}}
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/mimelnk/application
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/mime/packages/astah.xml
 cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
+# javadoc
+%if %{with javadoc}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -a api/en/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_mime_database
+%update_desktop_database_post
+
+%postun
+%update_mime_database
+%update_desktop_database_postun
+
+%post javadoc
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+
 %files
 %defattr(644,root,root,755)
 %doc README-e.txt ReleaseNote-e.html
 %doc %lang(ja) README.txt ReleaseNote.html ProductInformation.txt
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/%{name}
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/%{name}-%{codename}.jar
-%{_datadir}/%{name}/Welcome.jude
-%lang(ja) %{_datadir}/%{name}/Welcome_ja.jude
 %{_desktopdir}/%{name}.desktop
-%{_datadir}/mimelnk/application/x-%{name}.desktop
+%{_datadir}/mime/packages/astah.xml
 %{_pixmapsdir}/%{name}.png
+
+%dir %{_examplesdir}/%{name}-%{version}
+%{_examplesdir}/%{name}-%{version}/Welcome.asta
+%{_examplesdir}/%{name}-%{version}/Sample.asta
+%lang(ja) %{_examplesdir}/%{name}-%{version}/Welcome_ja.asta
+
+%if %{with javadoc}
+%files javadoc
+%defattr(644,root,root,755)
+%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
+%endif
diff --git a/astah-community.xml b/astah-community.xml
new file mode 100644
index 0000000..cd316c6
--- /dev/null
+++ b/astah-community.xml
@@ -0,0 +1,12 @@
+<?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 xml:lang="en">Astah* Document</comment>
+		<glob pattern="*.asta"/>
+		<icon name="astah" />
+		<sub-class-of type="application/zip" />
+		<!-- backward compat with jude -->
+		<glob pattern="*.jude"/>
+		<alias type="application/x-jude"/>
+	</mime-type>
+</mime-info>
diff --git a/x-astah.desktop b/x-astah.desktop
deleted file mode 100644
index 64cbb36..0000000
--- a/x-astah.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Comment=JUDE Document
-Icon=jude
-Type=MimeType
-MimeType=application/x-jude
-Patterns=*.jude;