[josm/f12/master: 8/8] Update to 3514 svn revision
Cédric OLIVIER
cquad at fedoraproject.org
Tue Sep 7 20:24:21 UTC 2010
commit 5466646f25e8f84c6d6988d0abdc40f25945539a
Author: cquad <cquad at fedoraproject.org>
Date: Tue Sep 7 22:13:53 2010 +0200
Update to 3514 svn revision
REVISION.XML | 6 +-
josm-0-add_javadoc.patch | 48 ++--
josm-0-disable_oauth.patch | 678 ++++++++++++++++++++++++++++----
josm-0-remove_metadata-extractor.patch | 24 +-
josm-0-remove_svn_call.patch | 120 +++---
josm-0.3514svn.tar.gz | Bin 0 -> 6540554 bytes
josm.spec | 9 +-
7 files changed, 715 insertions(+), 170 deletions(-)
---
diff --git a/REVISION.XML b/REVISION.XML
index e569252..04acf41 100644
--- a/REVISION.XML
+++ b/REVISION.XML
@@ -3,7 +3,7 @@
<entry
kind="dir"
path="."
- revision="3329">
+ revision="3514">
<url>http://josm.openstreetmap.de/svn/trunk</url>
<repository>
<root>http://josm.openstreetmap.de/svn</root>
@@ -14,9 +14,9 @@
<depth>infinity</depth>
</wc-info>
<commit
- revision="3329">
+ revision="3514">
<author>stoecker</author>
-<date>2010-06-10T07:53:42.765279Z</date>
+<date>2010-09-05T21:03:46.127045Z</date>
</commit>
</entry>
</info>
diff --git a/josm-0-add_javadoc.patch b/josm-0-add_javadoc.patch
index 0f7857d..bfef00f 100644
--- a/josm-0-add_javadoc.patch
+++ b/josm-0-add_javadoc.patch
@@ -1,24 +1,24 @@
---- build.xml.origine2 2010-06-15 10:52:24.000000000 +0200
-+++ build.xml 2010-06-15 21:50:38.924117353 +0200
-@@ -230,5 +230,21 @@
-
- </target>
-
-+ <target name="javadoc" description="generate javadoc documentation">
-+ <javadoc
-+ destdir="javadoc"
-+ defaultexcludes="yes"
-+ author="true"
-+ version="true"
-+ use="true"
-+ access="protected"
-+ windowtitle="josm javadoc"
-+ failonerror="true">
-+ <packageset dir="src">
-+ <include name="org/openstreetmap/josm/gui"/>
-+ <exclude name="org.xnap.*" />
-+ </packageset>
-+ </javadoc>
-+ </target>
-
- </project>
+--- build.xml.original 2010-09-07 06:59:40.577824000 +0200
++++ build.xml 2010-09-07 19:13:17.487824672 +0200
+@@ -277,5 +277,21 @@ Build-Date: ${build.tstamp}
+
+ </target>
+
++ <target name="javadoc" description="generate javadoc documentation">
++ <javadoc
++ destdir="javadoc"
++ defaultexcludes="yes"
++ author="true"
++ version="true"
++ use="true"
++ access="protected"
++ windowtitle="josm javadoc"
++ failonerror="true">
++ <packageset dir="src">
++ <include name="org/openstreetmap/josm/gui"/>
++ <exclude name="org.xnap.*" />
++ </packageset>
++ </javadoc>
++ </target>
+
+ </project>
diff --git a/josm-0-disable_oauth.patch b/josm-0-disable_oauth.patch
index b16e1a7..3cfaeb5 100644
--- a/josm-0-disable_oauth.patch
+++ b/josm-0-disable_oauth.patch
@@ -1,27 +1,572 @@
-diff -uNr josm-0-3376-original/build.xml josm-0/build.xml
---- josm-0-3376-original/build.xml 2010-05-08 17:44:45.000000000 +0200
-+++ josm-0/build.xml 2010-07-21 23:00:18.483143707 +0200
-@@ -99,7 +99,6 @@
-
- <!-- All jar files necessary to run only JOSM (no tests) -->
- <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
-- <zipfileset src="lib/signpost-core-1.1.jar" />
- </jar>
- </target>
-
-@@ -119,7 +118,8 @@
-
- <target name="compile" depends="init">
- <javac srcdir="src" classpathref="classpath" destdir="build"
+diff -uNr josm-0-3514-original/build.xml josm-0/build.xml
+--- josm-0-3514-original/build.xml 2010-09-02 20:01:29.000000000 +0200
++++ josm-0/build.xml 2010-09-07 06:59:40.577824784 +0200
+@@ -1,281 +1,281 @@
+-<!-- ** build.xml - main ant file for JOSM
+-**
+-** To build run
+-** ant clean
+-** ant dist
+-** This will create 'josm-custom.jar' in directory 'dist'. See also
+-** https://josm.openstreetmap.de/wiki/CreateBuild
+-**
+-**
+--->
+-<project name="josm" default="dist" basedir="." xmlns:as="antlib:org.codehaus.mojo.animal_sniffer">
+- <property name="test.dir" value="test" />
+- <property name="src.dir" value="src" />
+- <property name="build.dir" value="build"/>
+- <!-- build parameter: compression level (ant -Dclevel=N)
+- N ranges from 0 (no compression) to 9 (maximum compression)
+- default: 9 -->
+- <condition property="clevel" value="${clevel}" else="9">
+- <isset property="clevel" />
+- </condition>
+-
+- <!-- Java classpath addition (all jar files to compile tests with this) -->
+- <path id="classpath">
+- <fileset dir="lib">
+- <include name="**/*.jar"/>
+- </fileset>
+- </path>
+-
+-
+- <!--
+- ** Used by Eclipse ant builder for updating
+- ** the REVISION file used by JOSM
+- -->
+- <target name="create-revision-eclipse">
+- <copy file="styles/standard/elemstyles.xml" todir="data"/>
+- <property name="revision.dir" value="bin"/>
+- <antcall target="create-revision" />
+- </target>
+-
+- <!--
+- ** Creates the REVISION file to be included in the distribution
+- -->
+- <target name="create-revision">
+- <property name="revision.dir" value="${build.dir}"/>
+- <exec append="false" output="REVISION.XML" executable="svn" failifexecutionfails="false">
+- <env key="LANG" value="C"/>
+- <arg value="info"/>
+- <arg value="--xml"/>
+- <arg value="."/>
+- </exec>
+- <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
+- <delete file="REVISION.XML" />
+- <tstamp>
+- <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
+- </tstamp>
+-
+- <property name="version.entry.commit.revision" value="UNKNOWN"/>
+- <mkdir dir="${revision.dir}" />
+- <echo file="${revision.dir}/REVISION">
+-# automatically generated by JOSM build.xml - do not edit
+-Revision: ${version.entry.commit.revision}
+-Is-Local-Build: true
+-Build-Date: ${build.tstamp}
+-</echo>
+- </target>
+-
+-
+- <target name="dist" depends="compile,create-revision">
+-
+- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+- <env key="LANG" value="C"/>
+- <arg value="info"/>
+- <arg value="--xml"/>
+- <arg value="."/>
+- </exec>
+- <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+- <delete file="REVISION"/>
+- <property name="version.entry.commit.revision" value="UNKNOWN"/>
+- <property name="version.entry.commit.date" value="UNKNOWN"/>
+- <echo>Revision ${version.entry.commit.revision}</echo>
+- <copy file="CONTRIBUTION" todir="build"/>
+- <copy file="README" todir="build"/>
+- <copy file="LICENSE" todir="build"/>
+-
+- <!-- styles -->
+- <copy file="styles/standard/elemstyles.xml" todir="build/data"/>
+-
+- <!-- create josm-custom.jar -->
+- <delete file="dist/josm-custom.jar"/>
+- <jar destfile="dist/josm-custom.jar" basedir="build" level="${clevel}">
+- <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
+- <manifest>
+- <attribute name="Main-class" value="JOSM" />
+- <attribute name="Main-Version" value="${version.entry.commit.revision} SVN"/>
+- <attribute name="Main-Date" value="${version.entry.commit.date}"/>
+- </manifest>
+- <zipfileset dir="images" prefix="images" />
+- <zipfileset dir="data" prefix="data" />
+-
+- <!-- All jar files necessary to run only JOSM (no tests) -->
+- <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
+- <zipfileset src="lib/signpost-core-1.2.1.1.jar" />
+- </jar>
+- </target>
+-
+- <target name="distmac" depends="dist">
+- <!-- modify MacOS X Info.plist file to hold the SVN version number -->
+- <copy file="macosx/JOSM.app/Contents/Info.plist" todir="build"/>
+- <replace file="build/Info.plist" token="@SVNVersion@" value="${version.entry.commit.revision}"/>
+- <!-- create ZIP file with MacOS X application bundle -->
+- <zip destfile="dist/josm-custom-macosx.zip" update="true">
+- <zipfileset dir="build" includes="CONTRIBUTION README LICENSE"/>
+- <zipfileset dir="macosx" includes="JOSM.app/Contents JOSM.app/Contents/MacOS JOSM.app/Contents/Resources JOSM.app/Contents/Resources/Java JOSM.app/Contents/PkgInfo JOSM.app/Contents/Resources/JOSM.icns"/>
+- <zipfileset dir="build" includes="Info.plist" prefix="JOSM.app/Contents"/>
+- <zipfileset dir="dist" includes="josm-custom.jar" prefix="JOSM.app/Contents/Resources/Java"/>
+- <zipfileset dir="macosx" includes="JOSM.app/Contents/MacOS/JOSM" filemode="755"/>
+- </zip>
+- </target>
+-
+- <target name="compile" depends="init">
+- <javac srcdir="src" classpathref="classpath" destdir="build"
+- target="1.5" source="1.5" debug="on" encoding="UTF-8">
+- <compilerarg value="-Xlint:deprecation"/>
+- <compilerarg value="-Xlint:unchecked"/>
+- </javac>
+- </target>
+-
+- <target name="init">
+- <mkdir dir="build" />
+- <mkdir dir="dist" />
+- </target>
+-
+- <target name="clean">
+- <delete dir="build" />
+- <delete dir="dist" />
+- </target>
+-
+- <path id="test.classpath">
+- <fileset dir="${test.dir}/lib">
+- <include name="**/*.jar"/>
+- </fileset>
+- <fileset dir="lib">
+- <include name="**/*.jar"/>
+- </fileset>
+- </path>
+-
+- <target name="test-init">
+- <mkdir dir="${test.dir}/${build.dir}" />
+- <mkdir dir="${test.dir}/report" />
+- </target>
+-
+- <target name="test-clean">
+- <delete dir="${test.dir}/${build.dir}"/>
+- <delete dir="${test.dir}/report"/>
+- </target>
+-
+- <target name="test-compile" depends="test-init">
+- <javac srcdir="${src.dir}:${test.dir}/unit" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
- target="1.5" source="1.5" debug="on" encoding="UTF-8">
-+ target="1.5" source="1.5" debug="on" encoding="UTF-8"
-+ excludes="org/openstreetmap/josm/gui/oauth/,org/openstreetmap/josm/data/oauth/">
- <compilerarg value="-Xlint:deprecation"/>
- <compilerarg value="-Xlint:unchecked"/>
- </javac>
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
---- josm-0-3376-original/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java 2010-05-15 21:57:19.000000000 +0200
-+++ josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java 2010-07-21 23:00:18.484143506 +0200
+- <compilerarg value="-Xlint:deprecation"/>
+- <compilerarg value="-Xlint:unchecked"/>
+- </javac>
+- <javac srcdir="${src.dir}:${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
+- target="1.5" source="1.5" debug="on" encoding="UTF-8">
+- <compilerarg value="-Xlint:deprecation"/>
+- <compilerarg value="-Xlint:unchecked"/>
+- </javac>
+- </target>
+-
+- <target name="test" depends="test-compile">
+- <junit printsummary="yes">
+- <sysproperty key="josm.home" value="${test.dir}/config/unit-josm.home"/>
+- <classpath>
+- <path refid="test.classpath"/>
+- <pathelement path="${test.dir}/${build.dir}"/>
+- <pathelement path="${test.dir}/config"/>
+- </classpath>
+- <formatter type="plain"/>
+- <formatter type="xml"/>
+- <batchtest fork="yes" todir="${test.dir}/report">
+- <fileset dir="${test.dir}/unit" includes="**/*.java"/>
+- </batchtest>
+- </junit>
+- </target>
+-
+- <target name="dist-optimized" depends="dist">
+- <taskdef resource="proguard/ant/task.properties" classpath="tools/proguard.jar" />
+- <proguard>
+- -injars dist/josm-custom.jar
+- -outjars dist/josm-custom-optimized.jar
+-
+- -libraryjars ${java.home}/lib/rt.jar
+- -libraryjars ${java.home}/lib/jce.jar
+-
+- -dontoptimize
+- -dontobfuscate
+-
+- -dontskipnonpubliclibraryclasses
+-
+- -keepclasseswithmembers public class org.openstreetmap.josm.gui.MainApplication {
+- public static void main(java.lang.String[]);
+- }
+-
+- -keep class JOSM
+- -keep class * extends org.openstreetmap.josm.io.FileImporter
+- -keep class * extends org.openstreetmap.josm.io.FileExporter
+- -keep class org.openstreetmap.josm.actions.search.SearchCompiler$Never
+-
+- -keepclassmembers enum * {
+- public static **[] values();
+- public static ** valueOf(java.lang.String);
+- }
+-
+- -keepclassmembers class * {
+- public protected *;
+- }
+- </proguard>
+- </target>
+-
+- <target name="check-plugins" depends="dist-optimized">
+- <echo message="Check of plugins binary compatibility (needs ant 1.8)"/>
+-
+- <local name="dir"/>
+- <local name="plugins"/>
+-
+- <property name="dir" value="plugin-check"/>
+-
+- <typedef uri="antlib:org.codehaus.mojo.animal_sniffer">
+- <classpath path="tools/animal-sniffer-ant-tasks-1.5.jar" />
+- </typedef>
+-
+- <delete dir="${dir}"/>
+-
+- <mkdir dir="${dir}"/>
+-
+- <as:build-signatures destfile="${dir}/api.sig">
+- <path>
+- <fileset file="dist/josm-custom-optimized.jar" />
+- <fileset file="${java.home}/lib/rt.jar" />
+- </path>
+- </as:build-signatures>
+-
+- <!-- Download plugins -->
+- <loadresource property="plugins">
+- <url url="http://josm.openstreetmap.de/plugin"/>
+- <filterchain>
+- <linecontainsregexp negate="true">
+- <regexp pattern="^\t.*"/>
+- </linecontainsregexp>
+- <linecontainsregexp negate="true">
+- <!-- List from PluginHandler.DEPRECATED_PLUGINS -->
+- <regexp pattern="mappaint|unglueplugin|ewmsplugin|ywms|tways-0.2|geotagged|landsat|namefinder|waypoints|slippy_map_chooser|tcx-support|usertools|AgPifoJ|utilsplugin"/>
+- </linecontainsregexp>
+- <tokenfilter>
+- <replaceregex pattern="^.*;" replace="" flags="gi"/>
+- </tokenfilter>
+- </filterchain>
+- </loadresource>
+-
+- <copy todir="${dir}" flatten="true">
+- <resourcelist>
+- <string value="${plugins}"/>
+- </resourcelist>
+- </copy>
+-
+- <!-- Check plugins -->
+- <as:check-signature signature="${dir}/api.sig">
+- <ignore classname="org.jgraph.*"/>
+- <ignore classname="com.touchgraph.*"/>
+- <ignore classname="com.sun.xml.fastinfoset.*"/>
+- <ignore classname="javax.jms.*"/>
+- <ignore classname="org.jvnet.staxex.*"/>
+- <ignore classname="javax.mail.*"/>
+- <ignore classname="com.sun.jdmk.*"/>
+- <path path="${dir}"/>
+- </as:check-signature>
+-
+- </target>
+-
+-
+-</project>
++<!-- ** build.xml - main ant file for JOSM
++**
++** To build run
++** ant clean
++** ant dist
++** This will create 'josm-custom.jar' in directory 'dist'. See also
++** https://josm.openstreetmap.de/wiki/CreateBuild
++**
++**
++-->
++<project name="josm" default="dist" basedir="." xmlns:as="antlib:org.codehaus.mojo.animal_sniffer">
++ <property name="test.dir" value="test" />
++ <property name="src.dir" value="src" />
++ <property name="build.dir" value="build"/>
++ <!-- build parameter: compression level (ant -Dclevel=N)
++ N ranges from 0 (no compression) to 9 (maximum compression)
++ default: 9 -->
++ <condition property="clevel" value="${clevel}" else="9">
++ <isset property="clevel" />
++ </condition>
++
++ <!-- Java classpath addition (all jar files to compile tests with this) -->
++ <path id="classpath">
++ <fileset dir="lib">
++ <include name="**/*.jar"/>
++ </fileset>
++ </path>
++
++
++ <!--
++ ** Used by Eclipse ant builder for updating
++ ** the REVISION file used by JOSM
++ -->
++ <target name="create-revision-eclipse">
++ <copy file="styles/standard/elemstyles.xml" todir="data"/>
++ <property name="revision.dir" value="bin"/>
++ <antcall target="create-revision" />
++ </target>
++
++ <!--
++ ** Creates the REVISION file to be included in the distribution
++ -->
++ <target name="create-revision">
++ <property name="revision.dir" value="${build.dir}"/>
++ <exec append="false" output="REVISION.XML" executable="svn" failifexecutionfails="false">
++ <env key="LANG" value="C"/>
++ <arg value="info"/>
++ <arg value="--xml"/>
++ <arg value="."/>
++ </exec>
++ <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
++ <delete file="REVISION.XML" />
++ <tstamp>
++ <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
++ </tstamp>
++
++ <property name="version.entry.commit.revision" value="UNKNOWN"/>
++ <mkdir dir="${revision.dir}" />
++ <echo file="${revision.dir}/REVISION">
++# automatically generated by JOSM build.xml - do not edit
++Revision: ${version.entry.commit.revision}
++Is-Local-Build: true
++Build-Date: ${build.tstamp}
++</echo>
++ </target>
++
++
++ <target name="dist" depends="compile,create-revision">
++
++ <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
++ <env key="LANG" value="C"/>
++ <arg value="info"/>
++ <arg value="--xml"/>
++ <arg value="."/>
++ </exec>
++ <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
++ <delete file="REVISION"/>
++ <property name="version.entry.commit.revision" value="UNKNOWN"/>
++ <property name="version.entry.commit.date" value="UNKNOWN"/>
++ <echo>Revision ${version.entry.commit.revision}</echo>
++ <copy file="CONTRIBUTION" todir="build"/>
++ <copy file="README" todir="build"/>
++ <copy file="LICENSE" todir="build"/>
++
++ <!-- styles -->
++ <copy file="styles/standard/elemstyles.xml" todir="build/data"/>
++
++ <!-- create josm-custom.jar -->
++ <delete file="dist/josm-custom.jar"/>
++ <jar destfile="dist/josm-custom.jar" basedir="build" level="${clevel}">
++ <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
++ <manifest>
++ <attribute name="Main-class" value="JOSM" />
++ <attribute name="Main-Version" value="${version.entry.commit.revision} SVN"/>
++ <attribute name="Main-Date" value="${version.entry.commit.date}"/>
++ </manifest>
++ <zipfileset dir="images" prefix="images" />
++ <zipfileset dir="data" prefix="data" />
++
++ <!-- All jar files necessary to run only JOSM (no tests) -->
++ <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
++ </jar>
++ </target>
++
++ <target name="distmac" depends="dist">
++ <!-- modify MacOS X Info.plist file to hold the SVN version number -->
++ <copy file="macosx/JOSM.app/Contents/Info.plist" todir="build"/>
++ <replace file="build/Info.plist" token="@SVNVersion@" value="${version.entry.commit.revision}"/>
++ <!-- create ZIP file with MacOS X application bundle -->
++ <zip destfile="dist/josm-custom-macosx.zip" update="true">
++ <zipfileset dir="build" includes="CONTRIBUTION README LICENSE"/>
++ <zipfileset dir="macosx" includes="JOSM.app/Contents JOSM.app/Contents/MacOS JOSM.app/Contents/Resources JOSM.app/Contents/Resources/Java JOSM.app/Contents/PkgInfo JOSM.app/Contents/Resources/JOSM.icns"/>
++ <zipfileset dir="build" includes="Info.plist" prefix="JOSM.app/Contents"/>
++ <zipfileset dir="dist" includes="josm-custom.jar" prefix="JOSM.app/Contents/Resources/Java"/>
++ <zipfileset dir="macosx" includes="JOSM.app/Contents/MacOS/JOSM" filemode="755"/>
++ </zip>
++ </target>
++
++ <target name="compile" depends="init">
++ <javac srcdir="src" classpathref="classpath" destdir="build"
++ target="1.5" source="1.5" debug="on" encoding="UTF-8"
++ excludes="org/openstreetmap/josm/gui/oauth/,org/openstreetmap/josm/data/oauth/">
++ <compilerarg value="-Xlint:deprecation"/>
++ <compilerarg value="-Xlint:unchecked"/>
++ </javac>
++ </target>
++
++ <target name="init">
++ <mkdir dir="build" />
++ <mkdir dir="dist" />
++ </target>
++
++ <target name="clean">
++ <delete dir="build" />
++ <delete dir="dist" />
++ </target>
++
++ <path id="test.classpath">
++ <fileset dir="${test.dir}/lib">
++ <include name="**/*.jar"/>
++ </fileset>
++ <fileset dir="lib">
++ <include name="**/*.jar"/>
++ </fileset>
++ </path>
++
++ <target name="test-init">
++ <mkdir dir="${test.dir}/${build.dir}" />
++ <mkdir dir="${test.dir}/report" />
++ </target>
++
++ <target name="test-clean">
++ <delete dir="${test.dir}/${build.dir}"/>
++ <delete dir="${test.dir}/report"/>
++ </target>
++
++ <target name="test-compile" depends="test-init">
++ <javac srcdir="${src.dir}:${test.dir}/unit" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
++ target="1.5" source="1.5" debug="on" encoding="UTF-8">
++ <compilerarg value="-Xlint:deprecation"/>
++ <compilerarg value="-Xlint:unchecked"/>
++ </javac>
++ <javac srcdir="${src.dir}:${test.dir}/functional" classpathref="test.classpath" destdir="${test.dir}/${build.dir}"
++ target="1.5" source="1.5" debug="on" encoding="UTF-8">
++ <compilerarg value="-Xlint:deprecation"/>
++ <compilerarg value="-Xlint:unchecked"/>
++ </javac>
++ </target>
++
++ <target name="test" depends="test-compile">
++ <junit printsummary="yes">
++ <sysproperty key="josm.home" value="${test.dir}/config/unit-josm.home"/>
++ <classpath>
++ <path refid="test.classpath"/>
++ <pathelement path="${test.dir}/${build.dir}"/>
++ <pathelement path="${test.dir}/config"/>
++ </classpath>
++ <formatter type="plain"/>
++ <formatter type="xml"/>
++ <batchtest fork="yes" todir="${test.dir}/report">
++ <fileset dir="${test.dir}/unit" includes="**/*.java"/>
++ </batchtest>
++ </junit>
++ </target>
++
++ <target name="dist-optimized" depends="dist">
++ <taskdef resource="proguard/ant/task.properties" classpath="tools/proguard.jar" />
++ <proguard>
++ -injars dist/josm-custom.jar
++ -outjars dist/josm-custom-optimized.jar
++
++ -libraryjars ${java.home}/lib/rt.jar
++ -libraryjars ${java.home}/lib/jce.jar
++
++ -dontoptimize
++ -dontobfuscate
++
++ -dontskipnonpubliclibraryclasses
++
++ -keepclasseswithmembers public class org.openstreetmap.josm.gui.MainApplication {
++ public static void main(java.lang.String[]);
++ }
++
++ -keep class JOSM
++ -keep class * extends org.openstreetmap.josm.io.FileImporter
++ -keep class * extends org.openstreetmap.josm.io.FileExporter
++ -keep class org.openstreetmap.josm.actions.search.SearchCompiler$Never
++
++ -keepclassmembers enum * {
++ public static **[] values();
++ public static ** valueOf(java.lang.String);
++ }
++
++ -keepclassmembers class * {
++ public protected *;
++ }
++ </proguard>
++ </target>
++
++ <target name="check-plugins" depends="dist-optimized">
++ <echo message="Check of plugins binary compatibility (needs ant 1.8)"/>
++
++ <local name="dir"/>
++ <local name="plugins"/>
++
++ <property name="dir" value="plugin-check"/>
++
++ <typedef uri="antlib:org.codehaus.mojo.animal_sniffer">
++ <classpath path="tools/animal-sniffer-ant-tasks-1.5.jar" />
++ </typedef>
++
++ <delete dir="${dir}"/>
++
++ <mkdir dir="${dir}"/>
++
++ <as:build-signatures destfile="${dir}/api.sig">
++ <path>
++ <fileset file="dist/josm-custom-optimized.jar" />
++ <fileset file="${java.home}/lib/rt.jar" />
++ </path>
++ </as:build-signatures>
++
++ <!-- Download plugins -->
++ <loadresource property="plugins">
++ <url url="http://josm.openstreetmap.de/plugin"/>
++ <filterchain>
++ <linecontainsregexp negate="true">
++ <regexp pattern="^\t.*"/>
++ </linecontainsregexp>
++ <linecontainsregexp negate="true">
++ <!-- List from PluginHandler.DEPRECATED_PLUGINS -->
++ <regexp pattern="mappaint|unglueplugin|ewmsplugin|ywms|tways-0.2|geotagged|landsat|namefinder|waypoints|slippy_map_chooser|tcx-support|usertools|AgPifoJ|utilsplugin"/>
++ </linecontainsregexp>
++ <tokenfilter>
++ <replaceregex pattern="^.*;" replace="" flags="gi"/>
++ </tokenfilter>
++ </filterchain>
++ </loadresource>
++
++ <copy todir="${dir}" flatten="true">
++ <resourcelist>
++ <string value="${plugins}"/>
++ </resourcelist>
++ </copy>
++
++ <!-- Check plugins -->
++ <as:check-signature signature="${dir}/api.sig">
++ <ignore classname="org.jgraph.*"/>
++ <ignore classname="com.touchgraph.*"/>
++ <ignore classname="com.sun.xml.fastinfoset.*"/>
++ <ignore classname="javax.jms.*"/>
++ <ignore classname="org.jvnet.staxex.*"/>
++ <ignore classname="javax.mail.*"/>
++ <ignore classname="com.sun.jdmk.*"/>
++ <path path="${dir}"/>
++ </as:check-signature>
++
++ </target>
++
++
++</project>
+diff -uNr josm-0-3514-original/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
+--- josm-0-3514-original/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java 2010-05-15 21:57:19.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java 2010-09-07 07:02:20.916949729 +0200
@@ -15,7 +15,7 @@
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.io.ChangesetClosedException;
@@ -85,19 +630,19 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/ExceptionDialogUti
if (e instanceof OsmApiException) {
OsmApiException oae = (OsmApiException) e;
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/MainApplication.java josm-0/src/org/openstreetmap/josm/gui/MainApplication.java
---- josm-0-3376-original/src/org/openstreetmap/josm/gui/MainApplication.java 2010-05-30 17:07:19.000000000 +0200
-+++ josm-0/src/org/openstreetmap/josm/gui/MainApplication.java 2010-07-21 23:00:18.485143471 +0200
-@@ -24,7 +24,7 @@
- import javax.swing.JFrame;
-
- import org.openstreetmap.josm.Main;
+diff -uNr josm-0-3514-original/src/org/openstreetmap/josm/gui/MainApplication.java josm-0/src/org/openstreetmap/josm/gui/MainApplication.java
+--- josm-0-3514-original/src/org/openstreetmap/josm/gui/MainApplication.java 2010-08-24 10:32:50.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/gui/MainApplication.java 2010-09-07 07:05:19.846824709 +0200
+@@ -34,7 +34,7 @@
+ import org.openstreetmap.josm.actions.AutoScaleAction;
+ import org.openstreetmap.josm.data.AutosaveTask;
+ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
+//import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.io.DefaultProxySelector;
import org.openstreetmap.josm.io.auth.CredentialsManagerFactory;
-@@ -177,7 +177,7 @@
+@@ -185,7 +185,7 @@
DefaultAuthenticator.createInstance(CredentialsManagerFactory.getCredentialManager());
Authenticator.setDefault(DefaultAuthenticator.getInstance());
ProxySelector.setDefault(new DefaultProxySelector(ProxySelector.getDefault()));
@@ -106,9 +651,9 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/MainApplication.ja
// asking for help? show help and exit
if (args.containsKey("help")) {
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
---- josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java 2010-03-05 10:54:39.000000000 +0100
-+++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java 2010-07-21 23:00:18.485143471 +0200
+diff -uNr josm-0-3514-original/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
+--- josm-0-3514-original/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java 2010-03-05 10:54:39.000000000 +0100
++++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java 2010-09-07 07:26:58.621936671 +0200
@@ -39,7 +39,7 @@
/** the panel for the basic authentication parameters */
private BasicAuthenticationPreferencesPanel pnlBasicAuthPreferences;
@@ -183,9 +728,9 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server
+*/
}
}
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
---- josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java 2010-03-05 10:54:39.000000000 +0100
-+++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java 2010-07-21 23:00:18.486143466 +0200
+diff -uNr josm-0-3514-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
+--- josm-0-3514-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java 2010-03-05 10:54:39.000000000 +0100
++++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java 2010-09-07 07:28:34.152949790 +0200
@@ -6,7 +6,7 @@
import java.util.logging.Logger;
@@ -257,9 +802,9 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server
}
/**
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
---- josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java 2010-03-05 10:54:39.000000000 +0100
-+++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java 2010-07-21 23:00:18.487143494 +0200
+diff -uNr josm-0-3514-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
+--- josm-0-3514-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java 2010-03-05 10:54:39.000000000 +0100
++++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java 2010-09-07 07:32:06.218949700 +0200
@@ -25,13 +25,17 @@
import javax.swing.JTextField;
@@ -365,26 +910,23 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server
}
public AlreadyAuthorisedPanel() {
-@@ -309,7 +319,7 @@
+@@ -309,6 +319,7 @@
}
public void actionPerformed(ActionEvent arg0) {
-- OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
-+/* OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
++/*
+ OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
OAuthAuthenticationPreferencesPanel.this,
apiUrl
- );
-@@ -320,7 +330,8 @@
+@@ -320,6 +331,7 @@
holder.setSaveToPreferences(wizard.isSaveAccessTokenToPreferences());
pnlAdvancedProperties.setAdvancedParameters(wizard.getOAuthParameters());
refreshView();
-- }
-+*/
-+ }
++*/
+ }
}
- /**
-@@ -334,6 +345,7 @@
+@@ -334,6 +346,7 @@
}
public void actionPerformed(ActionEvent arg0) {
@@ -392,7 +934,7 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server
OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
OAuthAuthenticationPreferencesPanel.this,
apiUrl
-@@ -345,6 +357,7 @@
+@@ -345,6 +358,7 @@
holder.setSaveToPreferences(wizard.isSaveAccessTokenToPreferences());
pnlAdvancedProperties.setAdvancedParameters(wizard.getOAuthParameters());
refreshView();
@@ -400,7 +942,7 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server
}
}
-@@ -360,6 +373,7 @@
+@@ -360,6 +374,7 @@
}
public void actionPerformed(ActionEvent evt) {
@@ -408,7 +950,7 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server
OAuthToken token = OAuthAccessTokenHolder.getInstance().getAccessToken();
OAuthParameters parameters = OAuthParameters.createFromPreferences(Main.pref);
TestAccessTokenTask task = new TestAccessTokenTask(
-@@ -369,6 +383,7 @@
+@@ -369,6 +384,7 @@
token
);
Main.worker.submit(task);
@@ -416,9 +958,9 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server
}
}
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/io/auth/CredentialsManager.java josm-0/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
---- josm-0-3376-original/src/org/openstreetmap/josm/io/auth/CredentialsManager.java 2010-03-05 10:54:39.000000000 +0100
-+++ josm-0/src/org/openstreetmap/josm/io/auth/CredentialsManager.java 2010-07-21 23:00:18.487143494 +0200
+diff -uNr josm-0-3514-original/src/org/openstreetmap/josm/io/auth/CredentialsManager.java josm-0/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
+--- josm-0-3514-original/src/org/openstreetmap/josm/io/auth/CredentialsManager.java 2010-03-05 10:54:39.000000000 +0100
++++ josm-0/src/org/openstreetmap/josm/io/auth/CredentialsManager.java 2010-09-07 07:33:24.404824711 +0200
@@ -4,7 +4,7 @@
import java.net.PasswordAuthentication;
import java.net.Authenticator.RequestorType;
@@ -444,9 +986,9 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/io/auth/CredentialsMan
- public void storeOAuthAccessToken(OAuthToken accessToken) throws CredentialsManagerException;
+// public void storeOAuthAccessToken(OAuthToken accessToken) throws CredentialsManagerException;
}
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java josm-0/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java
---- josm-0-3376-original/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java 2010-06-26 21:09:24.000000000 +0200
-+++ josm-0/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java 2010-07-21 23:00:18.488143351 +0200
+diff -uNr josm-0-3514-original/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java josm-0/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java
+--- josm-0-3514-original/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java 2010-09-04 15:52:04.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java 2010-09-07 07:35:19.086949751 +0200
@@ -7,7 +7,7 @@
import java.util.Map;
@@ -456,7 +998,7 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/io/auth/JosmPreference
import org.openstreetmap.josm.gui.io.CredentialDialog;
import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel;
-@@ -141,6 +141,7 @@
+@@ -143,6 +143,7 @@
* @return the current OAuth Access Token to access the OSM server.
* @throws CredentialsManagerException thrown if something goes wrong
*/
@@ -464,7 +1006,7 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/io/auth/JosmPreference
public OAuthToken lookupOAuthAccessToken() throws CredentialsManagerException {
String accessTokenKey = Main.pref.get("oauth.access-token.key", null);
String accessTokenSecret = Main.pref.get("oauth.access-token.secret", null);
-@@ -148,14 +149,14 @@
+@@ -150,14 +151,14 @@
return null;
return new OAuthToken(accessTokenKey, accessTokenSecret);
}
@@ -481,15 +1023,15 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/io/auth/JosmPreference
if (accessToken == null) {
Main.pref.put("oauth.access-token.key", null);
Main.pref.put("oauth.access-token.secret", null);
-@@ -164,4 +165,5 @@
+@@ -166,4 +167,5 @@
Main.pref.put("oauth.access-token.secret", accessToken.getSecret());
}
}
+*/
}
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/io/OsmConnection.java josm-0/src/org/openstreetmap/josm/io/OsmConnection.java
---- josm-0-3376-original/src/org/openstreetmap/josm/io/OsmConnection.java 2010-06-26 21:09:24.000000000 +0200
-+++ josm-0/src/org/openstreetmap/josm/io/OsmConnection.java 2010-07-21 23:00:18.488143351 +0200
+diff -uNr josm-0-3514-original/src/org/openstreetmap/josm/io/OsmConnection.java josm-0/src/org/openstreetmap/josm/io/OsmConnection.java
+--- josm-0-3514-original/src/org/openstreetmap/josm/io/OsmConnection.java 2010-06-26 21:09:24.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/io/OsmConnection.java 2010-09-07 07:36:40.695949735 +0200
@@ -12,12 +12,12 @@
import java.nio.charset.CharsetEncoder;
import java.util.logging.Logger;
@@ -541,9 +1083,9 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/io/OsmConnection.java
} else {
String msg = tr("Warning: unexpected value for preference ''{0}''. Got ''{1}''.", "osm-server.auth-method", authMethod);
System.err.println(msg);
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/tools/ExceptionUtil.java josm-0/src/org/openstreetmap/josm/tools/ExceptionUtil.java
---- josm-0-3376-original/src/org/openstreetmap/josm/tools/ExceptionUtil.java 2010-05-15 21:57:19.000000000 +0200
-+++ josm-0/src/org/openstreetmap/josm/tools/ExceptionUtil.java 2010-07-21 23:00:18.489143871 +0200
+diff -uNr josm-0-3514-original/src/org/openstreetmap/josm/tools/ExceptionUtil.java josm-0/src/org/openstreetmap/josm/tools/ExceptionUtil.java
+--- josm-0-3514-original/src/org/openstreetmap/josm/tools/ExceptionUtil.java 2010-05-15 21:57:19.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/tools/ExceptionUtil.java 2010-09-07 07:37:53.393824703 +0200
@@ -18,10 +18,10 @@
import java.util.regex.Pattern;
diff --git a/josm-0-remove_metadata-extractor.patch b/josm-0-remove_metadata-extractor.patch
index de5df12..a87ba8d 100644
--- a/josm-0-remove_metadata-extractor.patch
+++ b/josm-0-remove_metadata-extractor.patch
@@ -1,12 +1,12 @@
---- build.xml.origine 2010-06-22 20:15:14.253810000 +0200
-+++ build.xml 2010-06-22 20:16:36.211934671 +0200
-@@ -96,9 +96,6 @@ Build-Date: ${build.tstamp}
- </manifest>
- <zipfileset dir="images" prefix="images" />
- <zipfileset dir="data" prefix="data" />
--
-- <!-- All jar files necessary to run only JOSM (no tests) -->
-- <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
- </jar>
- </target>
-
+--- build.xml.original 2010-09-07 19:13:17.487824000 +0200
++++ build.xml 2010-09-07 19:18:06.299155446 +0200
+@@ -96,9 +96,6 @@ Build-Date: ${build.tstamp}
+ </manifest>
+ <zipfileset dir="images" prefix="images" />
+ <zipfileset dir="data" prefix="data" />
+-
+- <!-- All jar files necessary to run only JOSM (no tests) -->
+- <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
+ </jar>
+ </target>
+
diff --git a/josm-0-remove_svn_call.patch b/josm-0-remove_svn_call.patch
index 7f87379..0055009 100644
--- a/josm-0-remove_svn_call.patch
+++ b/josm-0-remove_svn_call.patch
@@ -1,61 +1,61 @@
---- build.xml.origine 2010-06-22 15:28:37.781274000 +0200
-+++ build.xml 2010-06-22 15:32:56.357399489 +0200
+--- build.xml.original 2010-09-07 19:18:06.299155000 +0200
++++ build.xml 2010-09-07 19:25:12.140824114 +0200
@@ -37,50 +37,26 @@
- <antcall target="create-revision" />
- </target>
-
-- <!--
-- ** Creates the REVISION file to be included in the distribution
-- -->
-- <target name="create-revision">
-+ <target name="dist" depends="compile">
-+
- <property name="revision.dir" value="${build.dir}"/>
-- <exec append="false" output="REVISION.XML" executable="svn" failifexecutionfails="false">
-- <env key="LANG" value="C"/>
-- <arg value="info"/>
-- <arg value="--xml"/>
-- <arg value="."/>
-- </exec>
-- <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
-- <delete file="REVISION.XML" />
- <tstamp>
- <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
- </tstamp>
-
-- <property name="version.entry.commit.revision" value="UNKNOWN"/>
-- <mkdir dir="${revision.dir}" />
-- <echo file="${revision.dir}/REVISION">
--# automatically generated by JOSM build.xml - do not edit
--Revision: ${version.entry.commit.revision}
--Is-Local-Build: true
--Build-Date: ${build.tstamp}
--</echo>
-- </target>
--
--
-- <target name="dist" depends="compile,create-revision">
--
-- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-- <env key="LANG" value="C"/>
-- <arg value="info"/>
-- <arg value="--xml"/>
-- <arg value="."/>
-- </exec>
- <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-- <delete file="REVISION"/>
- <property name="version.entry.commit.revision" value="UNKNOWN"/>
- <property name="version.entry.commit.date" value="UNKNOWN"/>
- <echo>Revision ${version.entry.commit.revision}</echo>
- <copy file="CONTRIBUTION" todir="build"/>
- <copy file="README" todir="build"/>
- <copy file="LICENSE" todir="build"/>
-+ <echo file="${revision.dir}/REVISION">
-+# automatically generated by JOSM build.xml - do not edit
-+Revision: ${version.entry.commit.revision}
-+Is-Local-Build: true
-+Build-Date: ${build.tstamp}
-+</echo>
-
- <!-- styles -->
- <copy file="styles/standard/elemstyles.xml" todir="build/data"/>
+ <antcall target="create-revision" />
+ </target>
+
+- <!--
+- ** Creates the REVISION file to be included in the distribution
+- -->
+- <target name="create-revision">
++ <target name="dist" depends="compile">
++
+ <property name="revision.dir" value="${build.dir}"/>
+- <exec append="false" output="REVISION.XML" executable="svn" failifexecutionfails="false">
+- <env key="LANG" value="C"/>
+- <arg value="info"/>
+- <arg value="--xml"/>
+- <arg value="."/>
+- </exec>
+- <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
+- <delete file="REVISION.XML" />
+ <tstamp>
+ <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
+ </tstamp>
+
+- <property name="version.entry.commit.revision" value="UNKNOWN"/>
+- <mkdir dir="${revision.dir}" />
+- <echo file="${revision.dir}/REVISION">
+-# automatically generated by JOSM build.xml - do not edit
+-Revision: ${version.entry.commit.revision}
+-Is-Local-Build: true
+-Build-Date: ${build.tstamp}
+-</echo>
+- </target>
+-
+-
+- <target name="dist" depends="compile,create-revision">
+-
+- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+- <env key="LANG" value="C"/>
+- <arg value="info"/>
+- <arg value="--xml"/>
+- <arg value="."/>
+- </exec>
+ <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+- <delete file="REVISION"/>
+ <property name="version.entry.commit.revision" value="UNKNOWN"/>
+ <property name="version.entry.commit.date" value="UNKNOWN"/>
+ <echo>Revision ${version.entry.commit.revision}</echo>
+ <copy file="CONTRIBUTION" todir="build"/>
+ <copy file="README" todir="build"/>
+ <copy file="LICENSE" todir="build"/>
++ <echo file="${revision.dir}/REVISION">
++# automatically generated by JOSM build.xml - do not edit
++Revision: ${version.entry.commit.revision}
++Is-Local-Build: true
++Build-Date: ${build.tstamp}
++</echo>
+
+ <!-- styles -->
+ <copy file="styles/standard/elemstyles.xml" todir="build/data"/>
diff --git a/josm-0.3514svn.tar.gz b/josm-0.3514svn.tar.gz
new file mode 100644
index 0000000..c007d9a
Binary files /dev/null and b/josm-0.3514svn.tar.gz differ
diff --git a/josm.spec b/josm.spec
index 15e0c3a..9628191 100644
--- a/josm.spec
+++ b/josm.spec
@@ -1,12 +1,12 @@
#
# spec file for package josm
-%global svn_revision 3376
+%global svn_revision 3514
Name: josm
Version: 0
-Release: 0.9.%{svn_revision}svn%{?dist}
+Release: 0.10.%{svn_revision}svn%{?dist}
Summary: An editor for OpenStreetMap (OSM)
Group: Applications/Internet
License: GPLv2+
@@ -17,7 +17,7 @@ Source2: %{name}.desktop
Source3: %{name}-generate-tarball.sh
Source4: %{name}.1
Source5: REVISION.XML
-#Source built using the following commands : ./josm-generate-tarball.sh 3329
+#Source built using the following commands : ./josm-generate-tarball.sh 3514
#patch to disable oauth, it is needed because oauth requires maven 2.0.9 and a maven > 2.0.8 seels to be only planned for F14
Patch0: %{name}-%{version}-disable_oauth.patch
@@ -142,6 +142,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Wed Jul 21 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.10.3514svn
+- Update to 3514 svn revision
+
* Wed Jul 21 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.9.3376svn
- Update to 3376 svn revision
More information about the scm-commits
mailing list