diff --git a/.gitignore b/.gitignore
index 38fef5e..2b7e307 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ josm-0.9329svn.tar.gz
/josm-0.13710svn.tar.gz
/josm-0.14026svn.tar.gz
/josm-0.14066svn.tar.gz
+/josm-0.14824svn.tar.gz
diff --git a/josm-0-add_classpath.patch b/josm-0-add_classpath.patch
index 4f93ca5..cf432d9 100644
--- a/josm-0-add_classpath.patch
+++ b/josm-0-add_classpath.patch
@@ -16,7 +16,7 @@
--
@@ -25,20 +25,20 @@
--
-
+
@@ -287,7 +292,7 @@ Build-Date: ${build.tstamp}
--
-
+
@@ -325,6 +330,7 @@ Build-Date: ${build.tstamp}
-
-
--
--
--
--
-+
-
-
-
diff --git a/josm.spec b/josm.spec
index 4f5bb89..ceb1f77 100644
--- a/josm.spec
+++ b/josm.spec
@@ -1,12 +1,12 @@
#
# spec file for package josm
-
-%global svn_revision 14066
+%global svn_revision 14824
+%global fqdn org.openstreetmap.josm
Name: josm
Version: 0
-Release: 0.90.%{svn_revision}svn%{?dist}
+Release: 0.91.%{svn_revision}svn%{?dist}
Summary: An editor for OpenStreetMap (OSM)
License: GPLv2+
URL: https://josm.openstreetmap.de/
@@ -22,10 +22,6 @@ Patch1: %{name}-%{version}-add_classpath.patch
#remove call to "svn info" and fix in build.xml revision and commit date
Patch2: %{name}-%{version}-remove_svn_call.patch
-# remove static analysis compiler error prone:
-Patch3: %{name}-%{version}-remove_errorprone.patch
-
-
BuildArch: noarch
# OpenJFX is not available anywhere else than on following arches
@@ -94,7 +90,6 @@ This package contains the API documentation for %{name}.
%setup -q
%patch1 -p0
%patch2 -p1
-%patch3 -p1 -b .error_prone
find . -name '*.jar' -exec rm -f '{}' \;
find . -name '*.class' -exec rm -f '{}' \;
@@ -129,7 +124,6 @@ ln -s $(build-classpath javacc) tools/javacc.jar
iconv -f iso8859-15 -t utf-8 CONTRIBUTION > CONTRIBUTION.conv && mv -f CONTRIBUTION.conv CONTRIBUTION
%build
-export JOSM_NOJAVAFX=yes
ant javacc
ant javadoc
ant
@@ -144,22 +138,22 @@ cp -rp javadoc \
install -p -m 644 dist/%{name}-custom.jar %{buildroot}%{_javadir}/%{name}.jar
-%jpackage_script org.openstreetmap.josm.gui.MainApplication "" "" josm:metadata-extractor2-2:ant:signpost-core:apache-commons-codec:svgsalamander:xmpcore:apache-commons-compress:apache-commons-jcs:apache-commons-logging:jsonp josm true
+%jpackage_script %{fqdn}.gui.MainApplication "" "" josm:metadata-extractor2-2:ant:signpost-core:apache-commons-codec:svgsalamander:xmpcore:apache-commons-compress:apache-commons-jcs:apache-commons-logging:jsonp josm true
install -d %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
-install -p -m 644 images/logo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+install -p -m 644 images/logo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{fqdn}.svg
install -d %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-install -p -m 644 images/logo_48x48x32.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+install -p -m 644 images/logo_48x48x32.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{fqdn}.png
install -Dp -m 644 linux/tested/usr/share/man/man1/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
%if 0%{?fedora}
-install -Dp -m 644 linux/tested/usr/share/metainfo/%{name}.appdata.xml %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
+install -Dp -m 644 linux/tested/usr/share/metainfo/%{fqdn}.appdata.xml %{buildroot}/%{_datadir}/appdata/%{fqdn}.appdata.xml
%endif
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ linux/tested/usr/share/applications/%{name}.desktop
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ linux/tested/usr/share/applications/%{fqdn}.desktop
-appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{fqdn}.appdata.xml
%files
%doc README CONTRIBUTION
@@ -167,11 +161,11 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a
%{_mandir}/man1/%{name}.1.gz
%{_javadir}/%{name}.jar
%{_bindir}/%{name}
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{_datadir}/applications/%{fqdn}.desktop
+%{_datadir}/icons/hicolor/48x48/apps/%{fqdn}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{fqdn}.svg
%if 0%{?fedora}
-%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/appdata/%{fqdn}.appdata.xml
%endif
%files javadoc
@@ -180,6 +174,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a
%changelog
+* Mon Mar 25 2019 Jakub Jelen - 0-0.91.14824svn
+- New upstream release (#1672456)
+
* Fri Feb 01 2019 Fedora Release Engineering - 0-0.90.14066svn
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index ebd674c..e6fbb63 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (josm-0.14066svn.tar.gz) = 1081e6b48cd0964ff239c574a0c74b9164a0fe37556e31c20d44876b0831a8bdbb0a36ffa0def3712bff2e006a60ed4cc56490f8334e14c9c52619892c7f5c13
+SHA512 (josm-0.14824svn.tar.gz) = 3aef978721de92a37472f50af71ccc7b2a823e37525ce83a94630a0e07a6b58c1d845b91576c2dc4a5629bbf4b1ea2dd7e210a562f5a12c65ebf13af3b072e52