diff --git a/.gitignore b/.gitignore index 7c918f9..3f5c2bf 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ josm-0.9329svn.tar.gz /josm-0.11427svn.tar.gz /josm-0.13576svn.tar.gz /josm-0.13710svn.tar.gz +/josm-0.14026svn.tar.gz diff --git a/josm-0-add_classpath.patch b/josm-0-add_classpath.patch index 20d830e..4f93ca5 100644 --- a/josm-0-add_classpath.patch +++ b/josm-0-add_classpath.patch @@ -1,9 +1,9 @@ --- build.xml.patch1 2017-01-02 20:31:13.289502203 +0100 +++ build.xml 2017-01-02 20:46:47.217403900 +0100 @@ -37,6 +37,11 @@ - - - + + + + + + diff --git a/josm.spec b/josm.spec index dc2dfbe..0aa60fd 100644 --- a/josm.spec +++ b/josm.spec @@ -1,12 +1,12 @@ # # spec file for package josm -%global svn_revision 13710 +%global svn_revision 14066 Name: josm Version: 0 -Release: 0.88.%{svn_revision}svn%{?dist} +Release: 0.89.%{svn_revision}svn%{?dist} Summary: An editor for OpenStreetMap (OSM) Group: Applications/Internet License: GPLv2+ @@ -69,6 +69,7 @@ Requires: java-1.8.0-openjdk-openjfx # We still bundle some libraries Provides: bundled(gnu-getopt) = 1.0.5 +Provides: bundled(openjdk-javax-json) %description @@ -111,7 +112,7 @@ rm -rf ./src/org/apache/commons/compress #rm -rf ./src/org/apache/commons/jcs # removing jsonp -rm -rf ./src/javax +#rm -rf ./src/javax mkdir -p lib build-jar-repository -s lib \ @@ -130,6 +131,7 @@ 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 @@ -194,6 +196,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon Jul 30 2018 Jakub Jelen - 0-0.89.14066svn +- New upstream release (#1582964, #1604448) + * Fri Jul 13 2018 Fedora Release Engineering - 0-0.88.13710svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index fa7f4ab..d44ebdb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (josm-0.13710svn.tar.gz) = 66e3653033d7785ab9beb82ef10799fa403a6a5de69147ee523c6417c561fb3a55ad20492200760d9027556d496efe6b70c9cb23e011f579b54358f6f14a3a65 +SHA512 (josm-0.14026svn.tar.gz) = 87ced46f958a8773d20db47e7cc4f13e583ce1946495e5ce32459fc4fbc6ca2223a66003eb49df25738cf15b6bbfe387cdbdcc75590af81670b224d9aad3bc59