[josm/f16] Update to 5531 svn revision
Cédric OLIVIER
cquad at fedoraproject.org
Mon Oct 8 20:13:49 UTC 2012
commit 349ef04a183d2604442c3eb1558579ef62822a25
Author: Cédric OLIVIER <cedric.olivier at free.fr>
Date: Mon Oct 8 22:13:19 2012 +0200
Update to 5531 svn revision
.gitignore | 1 +
josm-0-add_classpath.patch | 10 +++++-----
josm.spec | 8 ++++++--
sources | 2 +-
4 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9d1a6e8..679f593 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ josm-0.3376svn.tar.gz
/josm-0.5181svn.tar.gz
/josm-0.5210svn.tar.gz
/josm-0.5485svn.tar.gz
+/josm-0.5531svn.tar.gz
diff --git a/josm-0-add_classpath.patch b/josm-0-add_classpath.patch
index 797616d..d7b048b 100644
--- a/josm-0-add_classpath.patch
+++ b/josm-0-add_classpath.patch
@@ -1,12 +1,12 @@
---- build.xml.patch1 2012-08-28 00:16:35.000000000 +0200
-+++ build.xml 2012-09-02 10:12:52.900751782 +0200
+--- build.xml.patch1 2012-09-07 22:18:59.000000000 +0200
++++ build.xml 2012-10-08 21:11:57.084150893 +0200
@@ -120,8 +120,7 @@ Build-Date: ${build.tstamp}
<!-- <javacc target="${mapcss.dir}/MapCSSParser.jj" javacchome="${javacc.home}" outputdirectory="${mapcss.dir}/parsergen"/>-->
</target>
<target name="compile" depends="init,javacc">
-- <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">
+- <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.6" source="1.6" debug="on" includeantruntime="false" encoding="UTF-8">
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:unchecked"/>
</javac>
diff --git a/josm.spec b/josm.spec
index 4e35c32..738246e 100644
--- a/josm.spec
+++ b/josm.spec
@@ -1,12 +1,12 @@
#
# spec file for package josm
-%global svn_revision 5485
+%global svn_revision 5531
Name: josm
Version: 0
-Release: 0.33.%{svn_revision}svn%{?dist}
+Release: 0.34.%{svn_revision}svn%{?dist}
Summary: An editor for OpenStreetMap (OSM)
Group: Applications/Internet
License: GPLv2+
@@ -85,6 +85,7 @@ 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
ln -s $(build-classpath commons-codec) lib/apache-commons-codec.jar
+ln -s $(build-classpath ant) lib/ant.jar
iconv -f iso8859-15 -t utf-8 CONTRIBUTION > CONTRIBUTION.conv && mv -f CONTRIBUTION.conv CONTRIBUTION
@@ -146,6 +147,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Mon Oct 08 2012 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.34.5531svn
+- Update to 5531 svn revision
+
* Sun Sep 02 2012 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.33.5485svn
- Change apache-commons-codec to commons-codec in classpath needed by f18+
diff --git a/sources b/sources
index 218f1f4..679b652 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d8c4c604295c9901c4f1a0267561555 josm-0.5485svn.tar.gz
+a72d554803836798e9e90d9bbe31dac2 josm-0.5531svn.tar.gz
More information about the scm-commits
mailing list