[josm/f15/master] Update to 3961 svn revision

[Cédric OLIVIER]

commit 99e8a95f64a481c5223a7b50ac4ab8655be56a39
Author: cquad <cquad at fedoraproject.org>
Date:   Tue Mar 8 20:24:55 2011 +0100

    Update to 3961 svn revision

 .gitignore                       |    1 +
 josm-0-remove_external_lib.patch |    8 ++++----
 josm-0-remove_svn_call.patch     |   16 +++++++++-------
 josm.spec                        |    7 +++++--
 sources                          |    2 +-
 5 files changed, 20 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 459ec5a..d7829ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ josm-0.3376svn.tar.gz
 /josm-0-remove_metadata-extractor.patch
 /josm-0-remove_svn_call.patch
 /josm.spec
+/josm-0.3961svn.tar.gz
diff --git a/josm-0-remove_external_lib.patch b/josm-0-remove_external_lib.patch
index 4093ded..a0aeae7 100644
--- a/josm-0-remove_external_lib.patch
+++ b/josm-0-remove_external_lib.patch
@@ -1,7 +1,7 @@
---- build.xml.origine	2011-01-11 18:28:53.733470303 +0100
-+++ build.xml	2011-01-11 18:29:10.896345519 +0100
-@@ -98,9 +98,6 @@ Build-Date: ${build.tstamp}
- 			<zipfileset dir="data" prefix="data" />
+--- 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) -->
diff --git a/josm-0-remove_svn_call.patch b/josm-0-remove_svn_call.patch
index a06d187..cb30406 100644
--- a/josm-0-remove_svn_call.patch
+++ b/josm-0-remove_svn_call.patch
@@ -1,6 +1,6 @@
---- build.xml.original	2010-10-07 19:22:42.330972000 +0200
-+++ build.xml	2010-10-07 19:25:14.197881019 +0200
-@@ -37,50 +37,26 @@
+--- 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>
  
@@ -9,7 +9,6 @@
 -	  -->
 -	<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"/>
@@ -33,7 +32,7 @@
 -</echo>
 -	</target>
 -
--
+ 
 -	<target name="dist" depends="compile,create-revision">
 -
 -		<exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
@@ -56,6 +55,9 @@
 +Is-Local-Build: true
 +Build-Date: ${build.tstamp}
 +</echo>
++
++		<!-- styles -->
++		<copy file="styles/standard/elemstyles.xml" todir="build/data"/>
  
- 		<!-- styles -->
- 		<copy file="styles/standard/elemstyles.xml" todir="build/data"/>
+ 		<!-- create josm-custom.jar -->
+ 		<delete file="dist/josm-custom.jar"/>
diff --git a/josm-generate-tarball.sh b/josm-generate-tarball.sh
old mode 100644
new mode 100755
diff --git a/josm.spec b/josm.spec
index e22d62a..10f7a6b 100644
--- a/josm.spec
+++ b/josm.spec
@@ -1,12 +1,12 @@
 #
 # spec file for package josm
 
-%global svn_revision 3751
+%global svn_revision 3961
 
 
 Name:           josm
 Version:        0
-Release:        0.15.%{svn_revision}svn%{?dist}
+Release:        0.16.%{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
+* Tue Mar 08 2011 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.16.3961svn
+- Update to 3961 svn revision
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.15.3751svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 1d46436..9c72064 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-80a851935deba949fd01b20548603a5f  josm-0.3751svn.tar.gz
+962015b95407660711861badea870f41  josm-0.3961svn.tar.gz