[josm] Update to 7906 svn revision

[Cédric OLIVIER]

commit a5ec715af40e6ec78e05cb3856d23e42707f9282
Author: Cédric OLIVIER <cedric.olivier at free.fr>
Date:   Sat Jan 17 17:47:48 2015 +0100

    Update to 7906 svn revision

 .gitignore                 |    2 ++
 josm-0-add_classpath.patch |   20 ++++++++++++--------
 josm.spec                  |   13 +++++++++++--
 sources                    |    2 +-
 4 files changed, 26 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9bd9496..04f62ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,5 @@ josm-0.3376svn.tar.gz
 /josm-0.7480svn.tar.gz
 /josm-0.7588svn.tar.gz
 /josm-0.7643svn.tar.gz
+/josm-0.7777svn.tar.gz
+/josm-0.7906svn.tar.gz
diff --git a/josm-0-add_classpath.patch b/josm-0-add_classpath.patch
index 9327c1b..c9fc922 100644
--- a/josm-0-add_classpath.patch
+++ b/josm-0-add_classpath.patch
@@ -1,24 +1,28 @@
---- build.xml.patch1	2014-05-15 17:01:12.000000000 +0200
-+++ build.xml	2014-06-17 09:47:07.214979683 +0200
-@@ -26,4 +26,10 @@
+--- build.xml.patch1	2015-01-17 15:08:34.947854325 +0100
++++ build.xml	2015-01-17 15:11:48.055845716 +0100
+@@ -26,6 +26,13 @@
          <os family="Windows"/>
      </condition>
+ 
 +    <!-- Java classpath addition (all jar files to compile tests with this) -->
 +    <path id="classpath">
 +        <fileset dir="lib">
 +            <include name="**/*.jar"/>
 +        </fileset>
 +    </path>
- 
++
      <!--
-@@ -211,8 +211,8 @@ Build-Date: ${build.tstamp}
+       ** Used by Eclipse ant builder for updating
+       ** the REVISION file used by JOSM
+@@ -215,9 +222,8 @@ Build-Date: ${build.tstamp}
      </target>
      <target name="compile" depends="init,javacc,jaxb">
          <!-- COTS -->
--        <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/codec/**,org/glassfish/**" nowarn="on"
+-        <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on"
+-            excludes="org/apache/commons/compress/compressors/lzma/**,org/apache/commons/compress/compressors/xz/**,org/apache/commons/compress/compressors/CompressorStreamFactory.java,org/apache/commons/compress/compressors/deflate/**,org/apache/commons/compress/compressors/gzip/**,org/apache/commons/compress/compressors/lzw/**,org/apache/commons/compress/compressors/pack200/**,org/apache/commons/compress/compressors/snappy/**,org/apache/commons/compress/compressors/z/**"
 -            destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="iso-8859-1">
-+        <javac srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/codec/**" classpathref="classpath" 
-+            destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" encoding="UTF-8">
++        <javac srcdir="${src.dir}" excludes="org/apache/commons/compress/compressors/lzma/**,org/apache/commons/compress/compressors/xz/**,org/apache/commons/compress/compressors/CompressorStreamFactory.java,org/apache/commons/compress/compressors/deflate/**,org/apache/commons/compress/compressors/gzip/**,org/apache/commons/compress/compressors/lzw/**,org/apache/commons/compress/compressors/pack200/**,org/apache/commons/compress/compressors/snappy/**,org/apache/commons/compress/compressors/z/**" classpathref="classpath"
++            destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
              <!-- get rid of "internal proprietary API" warning -->
              <compilerarg value="-XDignore.symbol.file"/>
          </javac>
diff --git a/josm.spec b/josm.spec
index 55eea79..1933e89 100644
--- a/josm.spec
+++ b/josm.spec
@@ -1,12 +1,12 @@
 #
 # spec file for package josm
 
-%global svn_revision 7643
+%global svn_revision 7906
 
 
 Name:           josm
 Version:        0
-Release:        0.60.%{svn_revision}svn%{?dist}
+Release:        0.62.%{svn_revision}svn%{?dist}
 Summary:        An editor for  OpenStreetMap (OSM)
 Group:          Applications/Internet
 License:        GPLv2+
@@ -36,6 +36,7 @@ BuildRequires:  signpost-core >= 1.2.1.1
 BuildRequires:  metadata-extractor2 >= 2.6.4
 BuildRequires:  svgsalamander
 BuildRequires:  apache-commons-codec
+BuildRequires:  apache-commons-compress
 BuildRequires:  gnu-getopt
 BuildRequires:  libappstream-glib
 Requires:       java >= 1:1.7.0 
@@ -47,6 +48,7 @@ Requires:       signpost-core >= 1.2.1.1
 Requires:       svgsalamander
 Requires:       gnu-getopt
 Requires:       xmpcore
+Requires:       apache-commons-compress
 
 
 %description
@@ -93,6 +95,7 @@ ln -s $(build-classpath commons-codec) lib/apache-commons-codec.jar
 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
 
 iconv -f iso8859-15 -t utf-8 CONTRIBUTION > CONTRIBUTION.conv && mv -f CONTRIBUTION.conv CONTRIBUTION
 
@@ -156,6 +159,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Jan 17 2015 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.62.7906svn
+- Update to 7906 svn revision
+
+* Wed Dec 24 2014 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.61.7777svn
+- Update to 7777 svn revision
+
 * Mon Nov 17 2014 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.60.7643svn
 - Include appdata
 
diff --git a/sources b/sources
index 715b10b..8b1860f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e20949a588b2c55a32a7d1ade1b8f41  josm-0.7643svn.tar.gz
+4dfbab3584a3ed097601dfee84732b70  josm-0.7906svn.tar.gz