diff --git a/josm.spec b/josm.spec index bb02c17..3e9cd23 100644 --- a/josm.spec +++ b/josm.spec @@ -6,7 +6,7 @@ Name: josm Version: 0 -Release: 0.69.%{svn_revision}svn%{?dist} +Release: 0.70.%{svn_revision}svn%{?dist} Summary: An editor for OpenStreetMap (OSM) Group: Applications/Internet License: GPLv2+ @@ -41,8 +41,9 @@ BuildRequires: metadata-extractor2 >= 2.6.4 BuildRequires: svgsalamander BuildRequires: apache-commons-codec BuildRequires: apache-commons-compress -BuildRequires: apache-commons-jcs +BuildRequires: apache-commons-jcs-core BuildRequires: gnu-getopt +BuildRequires: jsonp %if 0%{?fedora} BuildRequires: libappstream-glib %endif @@ -92,6 +93,14 @@ rm -rf ./src/oauth rm -rf ./src/com # removing gnu-getopt from sources and include it as dependencie rm -rf ./src/gnu +# removing jsonp from sources and include it as dep +rm -rf ./src/org/glassfish +# removing apache-commons-compress and jcs +rm -rf ./src/org/apache/commons/compress +#rm -rf ./src/org/apache/commons/jcs + +# removing jsonp +rm -rf ./src/javax mkdir -p lib ln -s $(build-classpath metadata-extractor2-2) lib/metadata-extractor.jar @@ -103,6 +112,9 @@ ln -s $(build-classpath ant) lib/ant.jar ln -s $(build-classpath gnu-getopt) lib/gnu-getopt.jar ln -s $(build-classpath gdata/gdata-core) lib/gdata-core.jar ln -s $(build-classpath apache-commons-compress) lib/apache-commons-compress.jar +ln -s $(build-classpath jsonp | awk -F: '{print $1}') lib/jsonp.jar +ln -s $(build-classpath jsonp-api | awk -F: '{print $1}') lib/jsonp-api.jar +#ln -s $(build-classpath apache-commons-jcs-core) lib/apache-commons-jcs-core.jar iconv -f iso8859-15 -t utf-8 CONTRIBUTION > CONTRIBUTION.conv && mv -f CONTRIBUTION.conv CONTRIBUTION @@ -172,6 +184,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Tue Feb 02 2016 Cédric OLIVIER 0-0.70.9329svn +- Remove jsonp from source + * Sat Jan 16 2016 Matěj Cepl - 0-0.69.9329svn - Update to 9329 svn revision (#1299047)