[josm/f19] Update to 7000 svn revision and Java 1.7
Cédric OLIVIER
cquad at fedoraproject.org
Wed May 7 04:40:00 UTC 2014
commit 3cb309e2cf02eca904adc2cb8e2d1e61d0d3d9bf
Author: Cédric Olivier <cedric.olivier at free.fr>
Date: Wed May 7 06:40:15 2014 +0200
Update to 7000 svn revision and Java 1.7
.gitignore | 1 +
josm-0-add_classpath.patch | 8 +++---
josm-0-remove_svn_call.patch | 49 +++++++++++++++--------------------------
josm-generate-tarball.sh | 2 +-
josm.spec | 11 ++++++---
sources | 2 +-
6 files changed, 32 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8b0d009..297ffcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ josm-0.3376svn.tar.gz
/josm-0.6115svn.tar.gz
/josm-0.6388svn.tar.gz
/josm-0.6502svn.tar.gz
+/josm-0.7000svn.tar.gz
diff --git a/josm-0-add_classpath.patch b/josm-0-add_classpath.patch
index f61a19a..cad504e 100644
--- a/josm-0-add_classpath.patch
+++ b/josm-0-add_classpath.patch
@@ -1,12 +1,12 @@
---- 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}
+--- build.xml.patch1 2014-04-01 23:37:44.000000000 +0200
++++ build.xml 2014-05-04 10:55:36.577555545 +0200
+@@ -210,8 +210,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"/>
- <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">
++ <javac srcdir="src" excludes="com/**,oauth/**,org/apache/commons/codec/**" classpathref="classpath" destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" encoding="UTF-8">
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:unchecked"/>
</javac>
diff --git a/josm-0-remove_svn_call.patch b/josm-0-remove_svn_call.patch
index 22e12e4..d1cff1d 100644
--- a/josm-0-remove_svn_call.patch
+++ b/josm-0-remove_svn_call.patch
@@ -1,26 +1,21 @@
---- 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"/>
+--- build.xml.patch2 2014-05-04 10:34:25.147194000 +0200
++++ build.xml 2014-05-05 07:48:06.626517130 +0200
+@@ -69,27 +69,7 @@
+ match=".*git-svn-id: [^@]*@([0-9]+).*(\d{4}-\d{2}-\d{2}.\d{2}\:\d{2}\:\d{2}\s*[+-]\d{2}:?\d{2})\s*$"
+ replace="<info><entry><commit revision="\1"><date>\2</date></commit></entry></info>"/>
</target>
- <!--
- ** Creates the REVISION file to be included in the distribution
- -->
-- <target name="create-revision">
+- <target name="create-revision" depends="init-svn-revision-xml, init-git-revision-xml">
- <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"/>
+- <property name="version.entry.commit.date" value="UNKNOWN"/>
- <mkdir dir="${revision.dir}"/>
- <!-- add Build-Name: ... when making special builds, e.g. DEBIAN -->
- <echo file="${revision.dir}/REVISION">
@@ -30,31 +25,23 @@
-Build-Date: ${build.tstamp}
-</echo>
- </target>
- <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>
++
+ <!--
+ ** Check internal XML files against their XSD
+ -->
+@@ -104,11 +84,24 @@ Build-Date: ${build.tstamp}
+ <!--
+ ** Main target that builds JOSM and checks XML against schemas
+ -->
- <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"/>
- <property name="version.entry.commit.date" value="UNKNOWN"/>
++ <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
++ <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"/>
diff --git a/josm-generate-tarball.sh b/josm-generate-tarball.sh
index 17a3d5d..b528e1b 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 7833cdf..db0df5a 100644
--- a/josm.spec
+++ b/josm.spec
@@ -1,12 +1,12 @@
#
# spec file for package josm
-%global svn_revision 6502
+%global svn_revision 7000
Name: josm
Version: 0
-Release: 0.51.%{svn_revision}svn%{?dist}
+Release: 0.52.%{svn_revision}svn%{?dist}
Summary: An editor for OpenStreetMap (OSM)
Group: Applications/Internet
License: GPLv2+
@@ -31,7 +31,7 @@ BuildArch: noarch
BuildRequires: jpackage-utils
BuildRequires: desktop-file-utils
BuildRequires: ant
-BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: java-devel >= 1:1.7.0
BuildRequires: gettext
BuildRequires: javacc
BuildRequires: signpost-core >= 1.2.1.1
@@ -40,7 +40,7 @@ BuildRequires: svgsalamander
BuildRequires: apache-commons-codec
BuildRequires: gnu-getopt
#BuildRequires: gdata-java
-Requires: java >= 1:1.6.0
+Requires: java >= 1:1.7.0
Requires: jpackage-utils
Requires: hicolor-icon-theme
Requires: metadata-extractor2 >= 2.6.4
@@ -154,6 +154,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sun May 04 2014 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.52.7000svn
+- Update to 7000 svn revision
+
* Tue Jan 07 2014 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.51.6502svn
- Add xmpcore in classpath
diff --git a/sources b/sources
index 8280857..287d1eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b667c337a9ed44b3862978f972db2bc7 josm-0.6502svn.tar.gz
+ca998452f34b1d61874dededfc3f2a2a josm-0.7000svn.tar.gz
More information about the scm-commits
mailing list