[josm] Update to 4279 svn revision

[Cédric OLIVIER]

commit f57432d18f06114bf1f99b64f01baba79f807cfe
Author: builder <builder at venom.localdomain>
Date:   Wed Oct 26 20:04:33 2011 +0200

    Update to 4279 svn revision

 .gitignore                       |    1 +
 josm                             |    2 +-
 josm-0-add_classpath.patch       |   12 ++++++++++++
 josm-0-remove_external_lib.patch |   12 ------------
 josm.spec                        |   25 +++++++++++++++++++------
 sources                          |    2 +-
 6 files changed, 34 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8eb21bd..7e9b019 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ josm-0.3376svn.tar.gz
 /josm-0.4032svn.tar.gz
 /josm-0.4064svn.tar.gz
 /josm-0.4223svn.tar.gz
+/josm-0.4279svn.tar.gz
diff --git a/josm b/josm
index 9db9a0c..e4cd3d1 100644
--- a/josm
+++ b/josm
@@ -14,7 +14,7 @@ fi
 
 # Configuration
 MAIN_CLASS="JOSM"
-BASE_JARS="josm metadata-extractor ant signpost-core commons-codec"
+BASE_JARS="josm metadata-extractor ant signpost-core commons-codec svgSalamander"
 
 # Set parameters
 set_classpath $BASE_JARS
diff --git a/josm-0-add_classpath.patch b/josm-0-add_classpath.patch
new file mode 100644
index 0000000..13d507b
--- /dev/null
+++ b/josm-0-add_classpath.patch
@@ -0,0 +1,12 @@
+--- build.xml.patch2	2011-08-15 09:19:37.969353859 +0200
++++ build.xml	2011-08-15 09:22:14.197533250 +0200
+@@ -119,8 +119,7 @@ Build-Date: ${build.tstamp}
+ <!--        <javacc target="${mapcss.dir}/MapCSSParser.jj" javacchome="${javacc.home}" outputdirectory="${mapcss.dir}/parsergen"/>-->
+     </target>
+     <target name="compile" depends="javacc,init">
+-        <javac srcdir="src" includes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="iso-8859-1"/>
+-        <javac srcdir="src" excludes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="UTF-8">
++        <javac srcdir="src" excludes="com/**,oauth/**,org/apache/commons/codec/**" classpathref="classpath" destdir="build" target="1.5" source="1.5" debug="on" encoding="UTF-8">
+             <compilerarg value="-Xlint:deprecation"/>
+             <compilerarg value="-Xlint:unchecked"/>
+         </javac>
diff --git a/josm-generate-tarball.sh b/josm-generate-tarball.sh
old mode 100755
new mode 100644
diff --git a/josm.spec b/josm.spec
index d3fda48..b14ecef 100644
--- a/josm.spec
+++ b/josm.spec
@@ -1,12 +1,12 @@
 #
 # spec file for package josm
 
-%global svn_revision 4223
+%global svn_revision 4279
 
 
 Name:           josm
 Version:        0
-Release:        0.21.%{svn_revision}svn%{?dist}
+Release:        0.22.%{svn_revision}svn%{?dist}
 Summary:        An editor for  OpenStreetMap (OSM)
 Group:          Applications/Internet
 License:        GPLv2+
@@ -22,7 +22,7 @@ Source4:        %{name}.1
 Patch1:         %{name}-%{version}-add_javadoc.patch
 
 #patch to remove metadata-extractor and signpost-core of final jar
-Patch2:         %{name}-%{version}-remove_external_lib.patch
+Patch2:         %{name}-%{version}-add_classpath.patch
 
 #remove call to "svn info" and fix in build.xml revision and commit date 
 Patch3:         %{name}-%{version}-remove_svn_call.patch 
@@ -36,8 +36,10 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  ant
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  gettext
-BuildRequires:  metadata-extractor >= 2.3.1
+BuildRequires:  javacc
 BuildRequires:  signpost-core >= 1.2.1.1
+BuildRequires:  metadata-extractor >= 2.3.1
+BuildRequires:  svgsalamander
 Requires:       java >= 1:1.6.0 
 Requires:       jpackage-utils
 Requires:       hicolor-icon-theme
@@ -75,8 +77,16 @@ This package contains the API documentation for %{name}.
 find . -name '*.jar' -exec rm -f '{}' \;
 find . -name '*.class' -exec rm -f '{}' \;
 
-ln -s $(build-classpath metadata-extractor) lib/metadata-extractor-2.3.1-nosun.jar
-ln -s $(build-classpath signpost-core) lib/signpost-core-1.2.1.1.jar
+# removing signpost source files and include signpost-core in buildrequires and requires
+rm -rf ./src/oauth
+# removing metadata-extractor and svgSalamander sources files and include metadata-extractor and svgSalamander dependencies
+rm -rf ./src/com
+
+ln -s $(build-classpath metadata-extractor) lib/metadata-extractor.jar
+ln -s $(build-classpath signpost-core) lib/signpost-core.jar
+ln -s $(build-classpath svgsalamander) lib/svgsalamander.jar
+ln -s $(build-classpath javacc) tools/javacc.jar
+
 
 iconv -f iso8859-15 -t utf-8 CONTRIBUTION > CONTRIBUTION.conv && mv -f CONTRIBUTION.conv CONTRIBUTION
 
@@ -138,6 +148,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sun Aug 14 2011 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.22.4279svn
+- Update to 4279 svn revision
+
 * Sun Jul 17 2011 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.21.4223svn
 - Update to 4223 svn revision
 
diff --git a/sources b/sources
index 26c1169..23442ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f325b97448b2564087dee372affeba3  josm-0.4223svn.tar.gz
+cd92285e89f41bebf26f3d286bd3f499  josm-0.4279svn.tar.gz