[josm] Update to 3751 svn revision

Cédric OLIVIER cquad at fedoraproject.org
Wed Jan 5 22:16:32 UTC 2011


commit 132179362438412321df74acb693eabe06c8a77c
Author: cquad <cquad at fedoraproject.org>
Date:   Wed Jan 5 23:15:09 2011 +0100

    Update to 3751 svn revision

 .gitignore                             |    7 ++
 REVISION.XML                           |   23 -------
 josm-0-add_javadoc.patch               |    6 +-
 josm-0-disable_oauth.patch             |  110 +++++++++++++++----------------
 josm-0-remove_metadata-extractor.patch |   11 ++--
 josm-0-remove_svn_call.patch           |    4 +-
 josm-generate-tarball.sh               |    4 +-
 josm.spec                              |   24 ++++++-
 sources                                |    2 +-
 9 files changed, 94 insertions(+), 97 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1404906..459ec5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,8 @@
 josm-0.3376svn.tar.gz
+/josm-generate-tarball.sh
+/josm-0.3751svn.tar.gz
+/josm-0-disable_oauth.patch
+/josm-0-add_javadoc.patch
+/josm-0-remove_metadata-extractor.patch
+/josm-0-remove_svn_call.patch
+/josm.spec
diff --git a/josm-0-add_javadoc.patch b/josm-0-add_javadoc.patch
index 0f7857d..f08a6de 100644
--- a/josm-0-add_javadoc.patch
+++ b/josm-0-add_javadoc.patch
@@ -1,6 +1,6 @@
---- build.xml.origine2	2010-06-15 10:52:24.000000000 +0200
-+++ build.xml	2010-06-15 21:50:38.924117353 +0200
-@@ -230,5 +230,21 @@
+--- build.xml.original	2010-10-07 19:04:29.741006000 +0200
++++ build.xml	2010-10-07 19:20:09.022959840 +0200
+@@ -280,5 +280,21 @@ Build-Date: ${build.tstamp}
  
  	</target>
  
diff --git a/josm-0-disable_oauth.patch b/josm-0-disable_oauth.patch
index b16e1a7..6327265 100644
--- a/josm-0-disable_oauth.patch
+++ b/josm-0-disable_oauth.patch
@@ -1,27 +1,27 @@
-diff -uNr josm-0-3376-original/build.xml josm-0/build.xml
---- josm-0-3376-original/build.xml	2010-05-08 17:44:45.000000000 +0200
-+++ josm-0/build.xml	2010-07-21 23:00:18.483143707 +0200
-@@ -99,7 +99,6 @@
+diff -uNr josm-0-3751-original/build.xml josm-0/build.xml
+--- josm-0-3751-original/build.xml	2010-12-26 18:23:05.000000000 +0100
++++ josm-0/build.xml	2011-01-05 21:08:18.275745311 +0100
+@@ -100,7 +100,6 @@
  
  			<!-- 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.1.jar" />
+-			<zipfileset src="lib/signpost-core-1.2.1.1.jar" />
  		</jar>
  	</target>
  
-@@ -119,7 +118,8 @@
+@@ -120,7 +119,8 @@
  
  	<target name="compile" depends="init">
  		<javac srcdir="src" classpathref="classpath" destdir="build"
 -				target="1.5" source="1.5" debug="on" encoding="UTF-8">
 +				target="1.5" source="1.5" debug="on" encoding="UTF-8"
-+                                excludes="org/openstreetmap/josm/gui/oauth/,org/openstreetmap/josm/data/oauth/">
++				excludes="org/openstreetmap/josm/gui/oauth/,org/openstreetmap/josm/data/oauth/">
  			<compilerarg value="-Xlint:deprecation"/>
  			<compilerarg value="-Xlint:unchecked"/>
  		</javac>
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
---- josm-0-3376-original/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java	2010-05-15 21:57:19.000000000 +0200
-+++ josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java	2010-07-21 23:00:18.484143506 +0200
+diff -uNr josm-0-3751-original/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
+--- josm-0-3751-original/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java	2010-05-15 21:57:19.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java	2011-01-05 21:13:19.364745387 +0100
 @@ -15,7 +15,7 @@
  import org.openstreetmap.josm.Main;
  import org.openstreetmap.josm.io.ChangesetClosedException;
@@ -85,19 +85,19 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/ExceptionDialogUti
  
          if (e instanceof OsmApiException) {
              OsmApiException oae = (OsmApiException) e;
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/MainApplication.java josm-0/src/org/openstreetmap/josm/gui/MainApplication.java
---- josm-0-3376-original/src/org/openstreetmap/josm/gui/MainApplication.java	2010-05-30 17:07:19.000000000 +0200
-+++ josm-0/src/org/openstreetmap/josm/gui/MainApplication.java	2010-07-21 23:00:18.485143471 +0200
-@@ -24,7 +24,7 @@
- import javax.swing.JFrame;
- 
+diff -uNr josm-0-3751-original/src/org/openstreetmap/josm/gui/MainApplication.java josm-0/src/org/openstreetmap/josm/gui/MainApplication.java
+--- josm-0-3751-original/src/org/openstreetmap/josm/gui/MainApplication.java	2010-12-12 01:47:03.000000000 +0100
++++ josm-0/src/org/openstreetmap/josm/gui/MainApplication.java	2011-01-05 21:16:16.927620310 +0100
+@@ -33,7 +33,7 @@
  import org.openstreetmap.josm.Main;
+ import org.openstreetmap.josm.data.AutosaveTask;
+ import org.openstreetmap.josm.data.Preferences;
 -import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
 +//import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
  import org.openstreetmap.josm.gui.progress.ProgressMonitor;
  import org.openstreetmap.josm.io.DefaultProxySelector;
  import org.openstreetmap.josm.io.auth.CredentialsManagerFactory;
-@@ -177,7 +177,7 @@
+@@ -186,7 +186,7 @@
          DefaultAuthenticator.createInstance(CredentialsManagerFactory.getCredentialManager());
          Authenticator.setDefault(DefaultAuthenticator.getInstance());
          ProxySelector.setDefault(new DefaultProxySelector(ProxySelector.getDefault()));
@@ -106,9 +106,9 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/MainApplication.ja
  
          // asking for help? show help and exit
          if (args.containsKey("help")) {
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
---- josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java	2010-03-05 10:54:39.000000000 +0100
-+++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java	2010-07-21 23:00:18.485143471 +0200
+diff -uNr josm-0-3751-original/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
+--- josm-0-3751-original/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java	2010-09-15 08:21:16.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java	2011-01-05 21:17:32.968620350 +0100
 @@ -39,7 +39,7 @@
      /** the panel for the basic authentication parameters */
      private BasicAuthenticationPreferencesPanel pnlBasicAuthPreferences;
@@ -183,9 +183,9 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server
 +*/        
      }
  }
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
---- josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java	2010-03-05 10:54:39.000000000 +0100
-+++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java	2010-07-21 23:00:18.486143466 +0200
+diff -uNr josm-0-3751-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
+--- josm-0-3751-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java	2010-09-15 08:21:16.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java	2011-01-05 21:18:25.729620214 +0100
 @@ -6,7 +6,7 @@
  import java.util.logging.Logger;
  
@@ -210,7 +210,7 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server
      /**
       * Sets the access token hold by this holder.
 @@ -112,6 +114,7 @@
-      * 
+      *
       * @param token the access token. Can be null to clear the content in this holder.
       */
 +/*
@@ -257,9 +257,9 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server
      }
  
      /**
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
---- josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java	2010-03-05 10:54:39.000000000 +0100
-+++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java	2010-07-21 23:00:18.487143494 +0200
+diff -uNr josm-0-3751-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
+--- josm-0-3751-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java	2010-09-15 08:21:16.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java	2011-01-05 21:20:11.283745270 +0100
 @@ -25,13 +25,17 @@
  import javax.swing.JTextField;
  
@@ -365,26 +365,23 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server
          }
  
          public AlreadyAuthorisedPanel() {
-@@ -309,7 +319,7 @@
+@@ -309,6 +319,7 @@
  
          }
          public void actionPerformed(ActionEvent arg0) {
--            OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
-+/*            OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
++/*
+             OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
                      OAuthAuthenticationPreferencesPanel.this,
                      apiUrl
-             );
-@@ -320,7 +330,8 @@
+@@ -320,6 +331,7 @@
              holder.setSaveToPreferences(wizard.isSaveAccessTokenToPreferences());
              pnlAdvancedProperties.setAdvancedParameters(wizard.getOAuthParameters());
              refreshView();
--        }
-+*/             
-+        }       
++*/
+         }
      }
  
-     /**
-@@ -334,6 +345,7 @@
+@@ -334,6 +346,7 @@
  
          }
          public void actionPerformed(ActionEvent arg0) {
@@ -392,7 +389,7 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server
              OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
                      OAuthAuthenticationPreferencesPanel.this,
                      apiUrl
-@@ -345,6 +357,7 @@
+@@ -345,6 +358,7 @@
              holder.setSaveToPreferences(wizard.isSaveAccessTokenToPreferences());
              pnlAdvancedProperties.setAdvancedParameters(wizard.getOAuthParameters());
              refreshView();
@@ -400,7 +397,7 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server
          }
      }
  
-@@ -360,6 +373,7 @@
+@@ -360,6 +374,7 @@
          }
  
          public void actionPerformed(ActionEvent evt) {
@@ -408,7 +405,7 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server
              OAuthToken token = OAuthAccessTokenHolder.getInstance().getAccessToken();
              OAuthParameters parameters = OAuthParameters.createFromPreferences(Main.pref);
              TestAccessTokenTask task = new TestAccessTokenTask(
-@@ -369,6 +383,7 @@
+@@ -369,6 +384,7 @@
                      token
              );
              Main.worker.submit(task);
@@ -416,9 +413,9 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/gui/preferences/server
          }
      }
  
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/io/auth/CredentialsManager.java josm-0/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
---- josm-0-3376-original/src/org/openstreetmap/josm/io/auth/CredentialsManager.java	2010-03-05 10:54:39.000000000 +0100
-+++ josm-0/src/org/openstreetmap/josm/io/auth/CredentialsManager.java	2010-07-21 23:00:18.487143494 +0200
+diff -uNr josm-0-3751-original/src/org/openstreetmap/josm/io/auth/CredentialsManager.java josm-0/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
+--- josm-0-3751-original/src/org/openstreetmap/josm/io/auth/CredentialsManager.java	2010-03-05 10:54:39.000000000 +0100
++++ josm-0/src/org/openstreetmap/josm/io/auth/CredentialsManager.java	2011-01-05 21:20:50.548620368 +0100
 @@ -4,7 +4,7 @@
  import java.net.PasswordAuthentication;
  import java.net.Authenticator.RequestorType;
@@ -444,9 +441,9 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/io/auth/CredentialsMan
 -    public void storeOAuthAccessToken(OAuthToken accessToken) throws CredentialsManagerException;
 +//    public void storeOAuthAccessToken(OAuthToken accessToken) throws CredentialsManagerException;
  }
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java josm-0/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java
---- josm-0-3376-original/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java	2010-06-26 21:09:24.000000000 +0200
-+++ josm-0/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java	2010-07-21 23:00:18.488143351 +0200
+diff -uNr josm-0-3751-original/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java josm-0/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java
+--- josm-0-3751-original/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java	2010-11-29 13:08:25.000000000 +0100
++++ josm-0/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java	2011-01-05 21:21:43.397620310 +0100
 @@ -7,7 +7,7 @@
  import java.util.Map;
  
@@ -456,7 +453,7 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/io/auth/JosmPreference
  import org.openstreetmap.josm.gui.io.CredentialDialog;
  import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel;
  
-@@ -141,6 +141,7 @@
+@@ -143,6 +143,7 @@
       * @return the current OAuth Access Token to access the OSM server.
       * @throws CredentialsManagerException thrown if something goes wrong
       */
@@ -464,11 +461,10 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/io/auth/JosmPreference
      public OAuthToken lookupOAuthAccessToken() throws CredentialsManagerException {
          String accessTokenKey = Main.pref.get("oauth.access-token.key", null);
          String accessTokenSecret = Main.pref.get("oauth.access-token.secret", null);
-@@ -148,14 +149,14 @@
-             return null;
+@@ -151,13 +152,14 @@
          return new OAuthToken(accessTokenKey, accessTokenSecret);
      }
--
+ 
 +*/
      /**
       * Stores the OAuth Access Token <code>accessToken</code>.
@@ -481,15 +477,15 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/io/auth/JosmPreference
          if (accessToken == null) {
              Main.pref.put("oauth.access-token.key", null);
              Main.pref.put("oauth.access-token.secret", null);
-@@ -164,4 +165,5 @@
+@@ -166,4 +168,5 @@
              Main.pref.put("oauth.access-token.secret", accessToken.getSecret());
          }
      }
 +*/    
  }
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/io/OsmConnection.java josm-0/src/org/openstreetmap/josm/io/OsmConnection.java
---- josm-0-3376-original/src/org/openstreetmap/josm/io/OsmConnection.java	2010-06-26 21:09:24.000000000 +0200
-+++ josm-0/src/org/openstreetmap/josm/io/OsmConnection.java	2010-07-21 23:00:18.488143351 +0200
+diff -uNr josm-0-3751-original/src/org/openstreetmap/josm/io/OsmConnection.java josm-0/src/org/openstreetmap/josm/io/OsmConnection.java
+--- josm-0-3751-original/src/org/openstreetmap/josm/io/OsmConnection.java	2010-06-26 21:09:24.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/io/OsmConnection.java	2011-01-05 21:58:45.794745266 +0100
 @@ -12,12 +12,12 @@
  import java.nio.charset.CharsetEncoder;
  import java.util.logging.Logger;
@@ -541,9 +537,9 @@ diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/io/OsmConnection.java
          } else {
              String msg = tr("Warning: unexpected value for preference ''{0}''. Got ''{1}''.", "osm-server.auth-method", authMethod);
              System.err.println(msg);
-diff -uNr josm-0-3376-original/src/org/openstreetmap/josm/tools/ExceptionUtil.java josm-0/src/org/openstreetmap/josm/tools/ExceptionUtil.java
---- josm-0-3376-original/src/org/openstreetmap/josm/tools/ExceptionUtil.java	2010-05-15 21:57:19.000000000 +0200
-+++ josm-0/src/org/openstreetmap/josm/tools/ExceptionUtil.java	2010-07-21 23:00:18.489143871 +0200
+diff -uNr josm-0-3751-original/src/org/openstreetmap/josm/tools/ExceptionUtil.java josm-0/src/org/openstreetmap/josm/tools/ExceptionUtil.java
+--- josm-0-3751-original/src/org/openstreetmap/josm/tools/ExceptionUtil.java	2010-09-25 10:39:16.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/tools/ExceptionUtil.java	2011-01-05 22:00:11.276620459 +0100
 @@ -18,10 +18,10 @@
  import java.util.regex.Pattern;
  
diff --git a/josm-0-remove_metadata-extractor.patch b/josm-0-remove_metadata-extractor.patch
index de5df12..325018f 100644
--- a/josm-0-remove_metadata-extractor.patch
+++ b/josm-0-remove_metadata-extractor.patch
@@ -1,10 +1,9 @@
---- build.xml.origine	2010-06-22 20:15:14.253810000 +0200
-+++ build.xml	2010-06-22 20:16:36.211934671 +0200
-@@ -96,9 +96,6 @@ Build-Date: ${build.tstamp}
- 			</manifest>
- 			<zipfileset dir="images" prefix="images" />
+--- build.xml.orginal	2011-01-05 21:08:18.275745000 +0100
++++ build.xml	2011-01-05 22:02:40.253745094 +0100
+@@ -98,8 +98,6 @@ Build-Date: ${build.tstamp}
  			<zipfileset dir="data" prefix="data" />
--
+ 			<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" />
  		</jar>
diff --git a/josm-0-remove_svn_call.patch b/josm-0-remove_svn_call.patch
index 7f87379..a06d187 100644
--- a/josm-0-remove_svn_call.patch
+++ b/josm-0-remove_svn_call.patch
@@ -1,5 +1,5 @@
---- build.xml.origine	2010-06-22 15:28:37.781274000 +0200
-+++ build.xml	2010-06-22 15:32:56.357399489 +0200
+--- 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 @@
  		<antcall target="create-revision" />
  	</target>
diff --git a/josm-generate-tarball.sh b/josm-generate-tarball.sh
old mode 100755
new mode 100644
index e58a1d9..b528e1b
--- a/josm-generate-tarball.sh
+++ b/josm-generate-tarball.sh
@@ -22,7 +22,9 @@ svn -r ${JOSM_SVN_TAG} export http://josm.openstreetmap.de/svn/trunk/ ${NAME_VER
 rm -r ${NAME_VERSION}/src/org/apache
 
 # Add REVISION.XML to source files
-cp ./REVISION.XML ${NAME_VERSION}/REVISION
+svn -r ${JOSM_SVN_TAG} co http://josm.openstreetmap.de/svn/trunk/ temporary_dir
+svn info --xml temporary_dir > ${NAME_VERSION}/REVISION
+rm -rf temporary_dir
 
 # creating source tar
 tar zcvf ${NAME_VERSION}.${JOSM_SVN_TAG}svn.tar.gz ${NAME_VERSION} #i18n plugins
diff --git a/josm.spec b/josm.spec
index 15e0c3a..de4f680 100644
--- a/josm.spec
+++ b/josm.spec
@@ -1,12 +1,12 @@
 #
 # spec file for package josm
 
-%global svn_revision 3376
+%global svn_revision 3751
 
 
 Name:           josm
 Version:        0
-Release:        0.9.%{svn_revision}svn%{?dist}
+Release:        0.13.%{svn_revision}svn%{?dist}
 Summary:        An editor for  OpenStreetMap (OSM)
 Group:          Applications/Internet
 License:        GPLv2+
@@ -16,8 +16,7 @@ Source1:        %{name}
 Source2:        %{name}.desktop
 Source3:        %{name}-generate-tarball.sh
 Source4:        %{name}.1
-Source5:        REVISION.XML
-#Source built using the following commands : ./josm-generate-tarball.sh 3329
+#Source built using the following commands : ./josm-generate-tarball.sh 3514
 
 #patch to disable oauth, it is needed because oauth requires maven 2.0.9 and a maven > 2.0.8 seels to be only planned for F14
 Patch0:         %{name}-%{version}-disable_oauth.patch
@@ -142,6 +141,23 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sun Jan 02 2011 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.13.3751svn
+- Update to 3751 svn revision
+- The Validator plugin has been integrated into the main program
+- Scaling of objects is supported. (Ctrl+Alt in select mode)
+  info To rotate an object click Ctrl+Shift
+- Layers can be displayed transparently. (new button in layer list dialog)
+- Plugins imagery,wmsplugin,slippymap and remotecontrol are integrated into JOSM core
+
+* Fri Nov 19 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.12.3592svn
+- Solve Bug 641756 - JOSM chooses wrong Java version on startup
+
+* Tue Oct 07 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.11.3592svn
+- Update to 3592 svn revision
+
+* Wed Jul 21 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.10.3514svn
+- Update to 3514 svn revision
+
 * Wed Jul 21 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.9.3376svn
 - Update to 3376 svn revision
 
diff --git a/sources b/sources
index e965967..7341900 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2f811da4f40a245cc9c82b11890cf4d0  josm-0.3376svn.tar.gz
+897c276c566ceed69d0fffab1ebcf82a  josm.spec


More information about the scm-commits mailing list