[josm] Update to 6502 svn revision

Cédric OLIVIER cquad at fedoraproject.org
Sun Dec 22 19:31:00 UTC 2013


commit fe8b3002e14455ee12004da35c1b7ece28bd22e0
Author: builder <builder at localhost.localdomain>
Date:   Sun Dec 22 20:31:04 2013 +0100

    Update to 6502 svn revision

 .gitignore                 |    1 +
 josm                       |    2 +-
 josm-0-add_classpath.patch |    8 ++++----
 josm-generate-tarball.sh   |    2 +-
 josm.spec                  |    7 +++++--
 sources                    |    2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9e5bfee..21fa1ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ josm-0.3376svn.tar.gz
 /josm-0.6115svn.tar.gz
 /josm-0.6238svn.tar.gz
 /josm-0.6388svn.tar.gz
+/josm-0.6502svn.tar.gz
diff --git a/josm b/josm
index a7fd2bf..6566757 100644
--- a/josm
+++ b/josm
@@ -14,7 +14,7 @@ fi
 
 # Configuration
 MAIN_CLASS="JOSM"
-BASE_JARS="josm metadata-extractor 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 ae14be9..f61a19a 100644
--- a/josm-0-add_classpath.patch
+++ b/josm-0-add_classpath.patch
@@ -1,7 +1,7 @@
---- build.xml.patch2	2013-10-13 16:24:44.608658000 +0200
-+++ build.xml	2013-10-13 16:32:32.226506355 +0200
-@@ -152,8 +152,7 @@ Build-Date: ${build.tstamp}
- <!--        <javacc target="${mapcss.dir}/MapCSSParser.jj" javacchome="${javacc.home}" outputdirectory="${mapcss.dir}/parsergen"/>-->
+--- build.xml.patch1	2013-12-06 21:15:34.000000000 +0100
++++ build.xml	2013-12-22 15:25:30.254820090 +0100
+@@ -180,8 +180,7 @@ Build-Date: ${build.tstamp}
+         </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"/>
diff --git a/josm-generate-tarball.sh b/josm-generate-tarball.sh
index b528e1b..17a3d5d 100644
--- a/josm-generate-tarball.sh
+++ b/josm-generate-tarball.sh
@@ -16,7 +16,7 @@ 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
diff --git a/josm.spec b/josm.spec
index c69a655..36b9d7e 100644
--- a/josm.spec
+++ b/josm.spec
@@ -1,12 +1,12 @@
 #
 # spec file for package josm
 
-%global svn_revision 6388
+%global svn_revision 6502
 
 
 Name:           josm
 Version:        0
-Release:        0.49.%{svn_revision}svn%{?dist}
+Release:        0.50.%{svn_revision}svn%{?dist}
 Summary:        An editor for  OpenStreetMap (OSM)
 Group:          Applications/Internet
 License:        GPLv2+
@@ -154,6 +154,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sun Dec 22 2013 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.50.6502svn
+- Update to 6502 svn revision
+
 * Sun Oct 13 2013 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.49.6388svn
 - Update to 6388 svn revision
 
diff --git a/sources b/sources
index 05f308c..8280857 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-63edfd1e7d8efe9bd830edc5f0a4057c  josm-0.6388svn.tar.gz
+b667c337a9ed44b3862978f972db2bc7  josm-0.6502svn.tar.gz


More information about the scm-commits mailing list