[josm/f21] Update to 7347 svn revision

[Cédric OLIVIER]

commit 0fc94b5eccd6ed6ca9f08f6f82c9b6b53b70d03d
Author: Cédric OLIVIER <cedric.olivier at free.fr>
Date:   Fri Aug 1 19:42:05 2014 +0200

    Update to 7347 svn revision

 .gitignore                 |    1 +
 josm                       |    2 +-
 josm-0-add_classpath.patch |   21 +++++++++++----------
 josm-generate-tarball.sh   |    4 +++-
 josm.spec                  |    9 ++++++---
 sources                    |    2 +-
 6 files changed, 23 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d6adc0f..803cce1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@ josm-0.3376svn.tar.gz
 /josm-0.6388svn.tar.gz
 /josm-0.6502svn.tar.gz
 /josm-0.7000svn.tar.gz
+/josm-0.7347svn.tar.gz
diff --git a/josm b/josm
index 4b58387..6566757 100644
--- a/josm
+++ b/josm
@@ -14,7 +14,7 @@ fi
 
 # Configuration
 MAIN_CLASS="JOSM"
-BASE_JARS="josm xmpcore metadata-extractor2-2 ant signpost-core commons-codec svgsalamander gnu-getopt"
+BASE_JARS="josm metadata-extractor2-2 ant signpost-core commons-codec svgsalamander gnu-getopt"
 
 # Set parameters
 set_classpath $BASE_JARS
diff --git a/josm-0-add_classpath.patch b/josm-0-add_classpath.patch
index cad504e..b6b2bff 100644
--- a/josm-0-add_classpath.patch
+++ b/josm-0-add_classpath.patch
@@ -1,12 +1,13 @@
---- build.xml.patch1	2014-04-01 23:37:44.000000000 +0200
-+++ build.xml	2014-05-04 10:55:36.577555545 +0200
-@@ -210,8 +210,7 @@ Build-Date: ${build.tstamp}
-         </exec>
+--- build.xml.patch1	2014-05-15 17:01:12.000000000 +0200
++++ build.xml	2014-06-17 09:47:07.214979683 +0200
+@@ -211,8 +211,8 @@ Build-Date: ${build.tstamp}
      </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" excludes="com/**,oauth/**,org/apache/commons/codec/**" classpathref="classpath" destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" encoding="UTF-8">
-             <compilerarg value="-Xlint:deprecation"/>
-             <compilerarg value="-Xlint:unchecked"/>
+     <target name="compile" depends="init,javacc,jaxb">
+         <!-- COTS -->
+-        <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/codec/**,org/glassfish/**" nowarn="on"
+-            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">
+             <!-- get rid of "internal proprietary API" warning -->
+             <compilerarg value="-XDignore.symbol.file"/>
          </javac>
diff --git a/josm-generate-tarball.sh b/josm-generate-tarball.sh
index b528e1b..15afce7 100644
--- a/josm-generate-tarball.sh
+++ b/josm-generate-tarball.sh
@@ -16,10 +16,12 @@ JOSM_SVN_TAG=$1
 rm -rf ${NAME_VERSION} 
 
 # cheking out josm svn
-svn -r ${JOSM_SVN_TAG} export http://josm.openstreetmap.de/svn/trunk/ ${NAME_VERSION}  
+svn -r ${JOSM_SVN_TAG} export http://josm.openstreetmap.de/svn/trunk/ ${NAME_VERSION}
 
 # Delete org.apache.tools.bzip2, it can be found in buildrequires ant package
 rm -r ${NAME_VERSION}/src/org/apache
+# Delete org.glassfish.json, it can be found in buildrequires ant package
+rm -r ${NAME_VERSION}/src/org/glassfishs
 
 # Add REVISION.XML to source files
 svn -r ${JOSM_SVN_TAG} co http://josm.openstreetmap.de/svn/trunk/ temporary_dir
diff --git a/josm.spec b/josm.spec
index af85940..0ae3efd 100644
--- a/josm.spec
+++ b/josm.spec
@@ -1,12 +1,12 @@
 #
 # spec file for package josm
 
-%global svn_revision 7000
+%global svn_revision 7347
 
 
 Name:           josm
 Version:        0
-Release:        0.53.%{svn_revision}svn%{?dist}
+Release:        0.54.%{svn_revision}svn%{?dist}
 Summary:        An editor for  OpenStreetMap (OSM)
 Group:          Applications/Internet
 License:        GPLv2+
@@ -39,7 +39,7 @@ BuildRequires:  metadata-extractor2 >= 2.6.4
 BuildRequires:  svgsalamander
 BuildRequires:  apache-commons-codec
 BuildRequires:  gnu-getopt
-#BuildRequires:  gdata-java
+#BuildRequires:  glassfish-jaxb
 Requires:       java >= 1:1.7.0 
 Requires:       jpackage-utils
 Requires:       hicolor-icon-theme
@@ -154,6 +154,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Aug 01 2014 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.54.7347svn
+- Update to 7347 svn revision
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.53.7000svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 287d1eb..e20fcc7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca998452f34b1d61874dededfc3f2a2a  josm-0.7000svn.tar.gz
+0900eb710309b615861d26f526b6408c  josm-0.7347svn.tar.gz