[josm/f18] Update to 5485 svn revision
Cédric OLIVIER
cquad at fedoraproject.org
Sun Sep 2 19:31:53 UTC 2012
commit 07ac286aeed4f58b48e1ce53631701ad25b293a2
Author: Cédric OLIVIER <cedric.olivier at free.fr>
Date: Sun Sep 2 21:30:45 2012 +0200
Update to 5485 svn revision
.gitignore | 1 +
josm-0-add_classpath.patch | 8 ++++----
josm-0-add_javadoc.patch | 24 ------------------------
josm-0-remove_svn_call.patch | 7 ++++---
josm.spec | 21 +++++++++++----------
sources | 2 +-
6 files changed, 21 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ee929d0..9d1a6e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ josm-0.3376svn.tar.gz
/josm-0.5177svn.tar.gz
/josm-0.5181svn.tar.gz
/josm-0.5210svn.tar.gz
+/josm-0.5485svn.tar.gz
diff --git a/josm-0-add_classpath.patch b/josm-0-add_classpath.patch
index 13d507b..797616d 100644
--- a/josm-0-add_classpath.patch
+++ b/josm-0-add_classpath.patch
@@ -1,9 +1,9 @@
---- build.xml.patch2 2011-08-15 09:19:37.969353859 +0200
-+++ build.xml 2011-08-15 09:22:14.197533250 +0200
-@@ -119,8 +119,7 @@ Build-Date: ${build.tstamp}
+--- build.xml.patch1 2012-08-28 00:16:35.000000000 +0200
++++ build.xml 2012-09-02 10:12:52.900751782 +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="javacc,init">
+ <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">
diff --git a/josm-0-remove_svn_call.patch b/josm-0-remove_svn_call.patch
index 8640831..3b9c9ab 100644
--- a/josm-0-remove_svn_call.patch
+++ b/josm-0-remove_svn_call.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
<property name="revision.dir" value="bin"/>
<antcall target="create-revision"/>
</target>
@@ -24,6 +24,7 @@
</tstamp>
- <property name="version.entry.commit.revision" value="UNKNOWN"/>
- <mkdir dir="${revision.dir}"/>
+- <!-- add Build-Name: ... when making special builds, e.g. DEBIAN -->
- <echo file="${revision.dir}/REVISION">
-# automatically generated by JOSM build.xml - do not edit
-Revision: ${version.entry.commit.revision}
diff --git a/josm.spec b/josm.spec
index 2b6d43d..4e35c32 100644
--- a/josm.spec
+++ b/josm.spec
@@ -1,12 +1,12 @@
#
# spec file for package josm
-%global svn_revision 5210
+%global svn_revision 5485
Name: josm
Version: 0
-Release: 0.31.%{svn_revision}svn%{?dist}
+Release: 0.33.%{svn_revision}svn%{?dist}
Summary: An editor for OpenStreetMap (OSM)
Group: Applications/Internet
License: GPLv2+
@@ -18,14 +18,11 @@ Source3: %{name}-generate-tarball.sh
Source4: %{name}.1
#Source built using the following commands : ./josm-generate-tarball.sh 3751
-#patch to add javadoc generation in build.xml
-Patch1: %{name}-%{version}-add_javadoc.patch
-
#patch to remove metadata-extractor and signpost-core of final jar
-Patch2: %{name}-%{version}-add_classpath.patch
+Patch1: %{name}-%{version}-add_classpath.patch
#remove call to "svn info" and fix in build.xml revision and commit date
-Patch3: %{name}-%{version}-remove_svn_call.patch
+Patch2: %{name}-%{version}-remove_svn_call.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -73,8 +70,6 @@ This package contains the API documentation for %{name}.
%setup -q
%patch1 -p0
%patch2 -p0
-%patch3 -p0
-
find . -name '*.jar' -exec rm -f '{}' \;
find . -name '*.class' -exec rm -f '{}' \;
@@ -89,7 +84,7 @@ ln -s $(build-classpath metadata-extractor) 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
-ln -s $(build-classpath apache-commons-codec) lib/apache-commons-codec.jar
+ln -s $(build-classpath commons-codec) lib/apache-commons-codec.jar
iconv -f iso8859-15 -t utf-8 CONTRIBUTION > CONTRIBUTION.conv && mv -f CONTRIBUTION.conv CONTRIBUTION
@@ -151,6 +146,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* 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+
+
+* Sun Sep 02 2012 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.32.5485svn
+- Update to 5485 svn revision
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.31.5210svn
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 566e36b..218f1f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-546c04a9682eb6039a459f16476469fc josm-0.5210svn.tar.gz
+0d8c4c604295c9901c4f1a0267561555 josm-0.5485svn.tar.gz
More information about the scm-commits
mailing list