[packages/josm] Version: 7000

[jajcus]

commit 646c4a63ee5d9f115b711a395272b1bb7834259e
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Thu May 1 17:57:28 2014 +0200

    Version: 7000
    
    Force Java 7 build, as building for 1.6 fails, complaining about the
    'diamond operator'.

 josm-java7.patch | 21 +++++++++++++++++++++
 josm.spec        | 10 ++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/josm.spec b/josm.spec
index 95b577e..b95bb8c 100644
--- a/josm.spec
+++ b/josm.spec
@@ -2,7 +2,7 @@
 Summary:	Java OpenStreetMap Editor
 Summary(pl.UTF-8):	Edytor OpenStreetMap w Javie
 Name:		josm
-Version:	6891
+Version:	7000
 Release:	1
 License:	GPL v2+
 Group:		Applications
@@ -10,17 +10,18 @@ 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:	8160c00b5a1692f310afcef325580a5f
+# Source0-md5:	2d05da4cdab4fd15745112d1728bf06f
 Patch0:		%{name}-version.patch
+Patch1:		%{name}-java7.patch
 BuildRequires:	ant
 %buildrequires_jdk
 BuildRequires:	rpm-javaprov
-Requires:	jre-X11 >= 1.6
+Requires:	jre-X11 >= 1.7
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-JOSM is an editor for OpenStreetMap (OSM) written in Java 1.5.
+JOSM is an editor for OpenStreetMap (OSM) written in Java 7.
 Currently it supports loading stand alone GPX tracks and GPX track
 data from the OSM database as well as loading and editing existing
 nodes, ways, metadata tags and relations from the OSM database.
@@ -29,6 +30,7 @@ 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
new file mode 100644
index 0000000..9291a76
--- /dev/null
+++ b/josm-java7.patch
@@ -0,0 +1,21 @@
+--- 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/646c4a63ee5d9f115b711a395272b1bb7834259e