[josm/f19] Update to 6388 svn revision
Cédric OLIVIER
cquad at fedoraproject.org
Thu Nov 21 22:29:48 UTC 2013
commit 180ac0230724f348a9864c83d551ac03bc8ada5f
Author: builder <builder at localhost.localdomain>
Date: Thu Nov 21 22:50:03 2013 +0100
Update to 6388 svn revision
.gitignore | 1 +
josm-0-add_classpath.patch | 6 +++---
josm-0-remove_svn_call.patch | 36 ++++++++++++++++++++++++------------
josm.spec | 17 ++++++++++++-----
sources | 2 +-
5 files changed, 41 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e729bdc..ee53430 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ josm-0.3376svn.tar.gz
/josm-0.5939svn.tar.gz
/josm-0.6060svn.tar.gz
/josm-0.6115svn.tar.gz
+/josm-0.6388svn.tar.gz
diff --git a/josm-0-add_classpath.patch b/josm-0-add_classpath.patch
index d7b048b..ae14be9 100644
--- a/josm-0-add_classpath.patch
+++ b/josm-0-add_classpath.patch
@@ -1,6 +1,6 @@
---- 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}
+--- 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"/>-->
</target>
<target name="compile" depends="init,javacc">
diff --git a/josm-0-remove_svn_call.patch b/josm-0-remove_svn_call.patch
index 3b9c9ab..22e12e4 100644
--- a/josm-0-remove_svn_call.patch
+++ b/josm-0-remove_svn_call.patch
@@ -1,16 +1,14 @@
---- build.xml.patch2 2012-09-02 10:12:52.000000000 +0200
-+++ build.xml 2012-09-02 10:22:30.131360796 +0200
-@@ -36,47 +36,25 @@
+--- build.xml.patch1 2013-09-05 01:34:04.000000000 +0200
++++ build.xml 2013-10-13 16:24:44.608658612 +0200
+@@ -35,32 +35,6 @@
<property name="revision.dir" value="bin"/>
<antcall target="create-revision"/>
</target>
- <!--
-- ** Creates the REVISION file to be included in the distribution
-- -->
+- ** 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}"/>
+- <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"/>
@@ -19,9 +17,9 @@
- </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>
+- <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}"/>
- <!-- add Build-Name: ... when making special builds, e.g. DEBIAN -->
@@ -32,13 +30,27 @@
-Build-Date: ${build.tstamp}
-</echo>
- </target>
-- <target name="dist" depends="compile,create-revision">
+ <target name="check-schemas">
+ <schemavalidate file="data/defaultpresets.xml" >
+ <schema namespace="http://josm.openstreetmap.de/tagging-preset-1.0" file="data/tagging-preset.xsd" />
+@@ -68,22 +42,25 @@ Build-Date: ${build.tstamp}
+ <schemavalidate file="styles/standard/elemstyles.xml" >
+ <schema namespace="http://josm.openstreetmap.de/mappaint-style-1.0" file="data/mappaint-style.xsd" />
+ </schemavalidate>
+- </target>
+- <target name="dist" depends="compile,create-revision,check-schemas">
- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="."/>
- </exec>
++ </target>
++ <target name="dist" depends="compile,check-schemas">
++ <property name="revision.dir" value="${build.dir}"/>
++ <tstamp>
++ <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
++ </tstamp>
<xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
- <delete file="REVISION"/>
<property name="version.entry.commit.revision" value="UNKNOWN"/>
diff --git a/josm.spec b/josm.spec
index cef3860..c69a655 100644
--- a/josm.spec
+++ b/josm.spec
@@ -1,12 +1,12 @@
#
# spec file for package josm
-%global svn_revision 6115
+%global svn_revision 6388
Name: josm
Version: 0
-Release: 0.47.%{svn_revision}svn%{?dist}
+Release: 0.49.%{svn_revision}svn%{?dist}
Summary: An editor for OpenStreetMap (OSM)
Group: Applications/Internet
License: GPLv2+
@@ -35,7 +35,7 @@ BuildRequires: java-devel >= 1:1.6.0
BuildRequires: gettext
BuildRequires: javacc
BuildRequires: signpost-core >= 1.2.1.1
-BuildRequires: metadata-extractor >= 2.3.1
+BuildRequires: metadata-extractor2 >= 2.6.4
BuildRequires: svgsalamander
BuildRequires: apache-commons-codec
BuildRequires: gnu-getopt
@@ -43,7 +43,7 @@ BuildRequires: gnu-getopt
Requires: java >= 1:1.6.0
Requires: jpackage-utils
Requires: hicolor-icon-theme
-Requires: metadata-extractor >= 2.3.1
+Requires: metadata-extractor2 >= 2.6.4
Requires: ant
Requires: signpost-core >= 1.2.1.1
Requires: svgsalamander
@@ -85,7 +85,7 @@ rm -rf ./src/com
# removing gnu-getopt from sources and include it as dependencie
rm -rf ./src/gnu
-ln -s $(build-classpath metadata-extractor) lib/metadata-extractor.jar
+ln -s $(build-classpath metadata-extractor2-2) 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
@@ -154,6 +154,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sun Oct 13 2013 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.49.6388svn
+- Update to 6388 svn revision
+
+* Sun Oct 13 2013 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.48.6238svn
+- Update to 6238 svn revision
+- Update requirement to metadata-extractor2
+
* Sun Aug 11 2013 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.47.6115svn
- Update to 6115 svn revision
diff --git a/sources b/sources
index c5abe3b..05f308c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8c0fc33ae48dff75fa1c9f3647ed5af3 josm-0.6115svn.tar.gz
+63edfd1e7d8efe9bd830edc5f0a4057c josm-0.6388svn.tar.gz
More information about the scm-commits
mailing list