[packages/josm] Version: 8109

[bszx]

commit 5f50b42499c1b56596d810acf1ad5cca80381345
Author: Bartek Szady <bszx at bszx.eu>
Date:   Sun Mar 15 17:38:12 2015 +0100

    Version: 8109

 josm-java7.patch | 21 ---------------------
 josm.spec        |  8 +++-----
 2 files changed, 3 insertions(+), 26 deletions(-)
---
diff --git a/josm.spec b/josm.spec
index b95bb8c..6e822d0 100644
--- a/josm.spec
+++ b/josm.spec
@@ -2,17 +2,16 @@
 Summary:	Java OpenStreetMap Editor
 Summary(pl.UTF-8):	Edytor OpenStreetMap w Javie
 Name:		josm
-Version:	7000
+Version:	8109
 Release:	1
 License:	GPL v2+
 Group:		Applications
 URL:		http://josm.openstreetmap.de/
 # this should be the 'tested' snapshot, as list on the web page
 # svn export -r%{version} http://josm.openstreetmap.de/svn/trunk josm-src-snapshot-%{version}
-Source0:	%{name}-src-snapshot-%{version}.tar.bz2
-# Source0-md5:	2d05da4cdab4fd15745112d1728bf06f
+Source0:	%{name}-src-snapshot-%{version}.tar.xz
+# Source0-md5:	cb81e510ff648a2f98ef0b26461b5179
 Patch0:		%{name}-version.patch
-Patch1:		%{name}-java7.patch
 BuildRequires:	ant
 %buildrequires_jdk
 BuildRequires:	rpm-javaprov
@@ -30,7 +29,6 @@ nodes, ways, metadata tags and relations from the OSM database.
 %setup -qn %{name}-src-snapshot-%{version}
 %undos build.xml
 %patch0 -p1
-%patch1 -p1
 
 %build
 echo -n "%{version}" > rpm_version
diff --git a/josm-java7.patch b/josm-java7.patch
deleted file mode 100644
index 9291a76..0000000
--- a/josm-java7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- josm-src-snapshot-7000/build.xml~	2014-05-01 17:50:12.802377981 +0200
-+++ josm-src-snapshot-7000/build.xml	2014-05-01 17:52:46.045712710 +0200
-@@ -202,15 +202,15 @@
-             <arg value="-cp"/>
-             <arg value="${javacc.home}/javacc.jar"/>
-             <arg value="javacc"/>
--            <arg value="-JDK_VERSION=1.6"/>
-+            <arg value="-JDK_VERSION=1.7"/>
-             <arg value="-GRAMMAR_ENCODING=UTF-8"/>
-             <arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
-             <arg value="${mapcss.dir}/MapCSSParser.jj"/>
-         </exec>
-     </target>
-     <target name="compile" depends="init,javacc">
--        <javac srcdir="src" includes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.6" source="1.6" debug="on" includeantruntime="false" encoding="iso-8859-1"/>
--        <javac srcdir="src" excludes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.6" source="1.6" debug="on" includeantruntime="false" encoding="UTF-8">
-+        <javac srcdir="src" includes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" encoding="iso-8859-1"/>
-+        <javac srcdir="src" excludes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" encoding="UTF-8">
-             <compilerarg value="-Xlint:deprecation"/>
-             <compilerarg value="-Xlint:unchecked"/>
-         </javac>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/josm.git/commitdiff/5f50b42499c1b56596d810acf1ad5cca80381345