[josm] Update to 4223 svn revision
Cédric OLIVIER
cquad at fedoraproject.org
Sun Jul 17 10:40:42 UTC 2011
commit bca734d1adc3ea834038adb87b557c9552cc59ed
Author: cquad <cquad at fedoraproject.org>
Date: Sun Jul 17 12:40:26 2011 +0200
Update to 4223 svn revision
.gitignore | 1 +
josm-0-add_javadoc.patch | 50 ++++++++--------
josm-0-remove_external_lib.patch | 24 ++++----
josm-0-remove_svn_call.patch | 120 ++++++++++++++++++--------------------
josm.spec | 7 ++-
sources | 2 +-
6 files changed, 102 insertions(+), 102 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e778216..8eb21bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ josm-0.3376svn.tar.gz
/josm-0.4021svn.tar.gz
/josm-0.4032svn.tar.gz
/josm-0.4064svn.tar.gz
+/josm-0.4223svn.tar.gz
diff --git a/josm-0-add_javadoc.patch b/josm-0-add_javadoc.patch
index 8f8c37e..b487a50 100644
--- a/josm-0-add_javadoc.patch
+++ b/josm-0-add_javadoc.patch
@@ -1,24 +1,26 @@
---- build.xml.orig 2010-12-26 18:23:05.000000000 +0100
-+++ build.xml 2011-01-11 18:28:04.467345761 +0100
-@@ -284,5 +284,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>
+--- build.xml.patch0 2011-06-25 18:51:06.000000000 +0200
++++ build.xml 2011-07-17 11:43:35.674747799 +0200
+@@ -279,4 +279,23 @@ Build-Date: ${build.tstamp}
+ <path path="${dir}"/>
+ </as:check-signature>
+ </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-remove_external_lib.patch b/josm-0-remove_external_lib.patch
index a0aeae7..ccae395 100644
--- a/josm-0-remove_external_lib.patch
+++ b/josm-0-remove_external_lib.patch
@@ -1,12 +1,12 @@
---- build.xml.origine 2011-03-08 19:04:42.554965000 +0100
-+++ build.xml 2011-03-08 19:06:38.446841229 +0100
-@@ -95,9 +95,6 @@ Build-Date: ${build.tstamp}
- <zipfileset dir="styles" prefix="styles" />
- <zipfileset dir="src/org/openstreetmap/gui/jmapviewer/images" prefix="org/openstreetmap/gui/jmapviewer/images" />
-
-- <!-- 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>
-
+--- build.xml.patch1 2011-07-17 11:43:35.000000000 +0200
++++ build.xml 2011-07-17 11:46:32.778982301 +0200
+@@ -86,9 +86,6 @@ Build-Date: ${build.tstamp}
+ <zipfileset dir="data" prefix="data"/>
+ <zipfileset dir="styles" prefix="styles"/>
+ <zipfileset dir="src/org/openstreetmap/gui/jmapviewer/images" prefix="org/openstreetmap/gui/jmapviewer/images"/>
+- <!-- 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">
diff --git a/josm-0-remove_svn_call.patch b/josm-0-remove_svn_call.patch
index cb30406..8640831 100644
--- a/josm-0-remove_svn_call.patch
+++ b/josm-0-remove_svn_call.patch
@@ -1,63 +1,57 @@
---- build.xml.origine2 2011-03-08 19:06:38.446841000 +0100
-+++ build.xml 2011-03-08 19:13:49.690841262 +0100
-@@ -36,50 +36,29 @@
- <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"/>
-
- <!-- create josm-custom.jar -->
- <delete file="dist/josm-custom.jar"/>
+--- build.xml.patch2 2011-07-17 11:46:32.000000000 +0200
++++ build.xml 2011-07-17 11:53:36.304018826 +0200
+@@ -33,46 +33,25 @@
+ <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">
++
++ <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>
+ <!-- create josm-custom.jar -->
+ <delete file="dist/josm-custom.jar"/>
+ <jar destfile="dist/josm-custom.jar" basedir="build" level="${clevel}">
diff --git a/josm.spec b/josm.spec
index ecd4b73..d3fda48 100644
--- a/josm.spec
+++ b/josm.spec
@@ -1,12 +1,12 @@
#
# spec file for package josm
-%global svn_revision 4064
+%global svn_revision 4223
Name: josm
Version: 0
-Release: 0.20.%{svn_revision}svn%{?dist}
+Release: 0.21.%{svn_revision}svn%{?dist}
Summary: An editor for OpenStreetMap (OSM)
Group: Applications/Internet
License: GPLv2+
@@ -138,6 +138,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sun Jul 17 2011 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.21.4223svn
+- Update to 4223 svn revision
+
* Wed May 25 2011 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.20.4064svn
- Update to 4064 svn revision
diff --git a/sources b/sources
index 6a81fff..26c1169 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29c38dd2b34c7a18f6a96214d745e1ae josm-0.4064svn.tar.gz
+6f325b97448b2564087dee372affeba3 josm-0.4223svn.tar.gz
More information about the scm-commits
mailing list