[josm/f14/master] Update to 3592 svn revision
Cédric OLIVIER
cquad at fedoraproject.org
Thu Oct 7 20:07:32 UTC 2010
commit 6653d584ac41187771ed77585985bd70eb28c7c7
Author: cquad <cquad at fedoraproject.org>
Date: Thu Oct 7 22:05:44 2010 +0200
Update to 3592 svn revision
REVISION.XML | 8 +-
josm-0-add_javadoc.patch | 6 +-
josm-0-disable_oauth.patch | 113 +++++++++++++++++---------------
josm-0-remove_metadata-extractor.patch | 4 +-
josm-0-remove_svn_call.patch | 4 +-
josm-0.3592svn.tar.gz | Bin 0 -> 6569209 bytes
josm.spec | 12 +++-
7 files changed, 79 insertions(+), 68 deletions(-)
---
diff --git a/REVISION.XML b/REVISION.XML
index e569252..8ab72e7 100644
--- a/REVISION.XML
+++ b/REVISION.XML
@@ -3,7 +3,7 @@
<entry
kind="dir"
path="."
- revision="3329">
+ revision="3592">
<url>http://josm.openstreetmap.de/svn/trunk</url>
<repository>
<root>http://josm.openstreetmap.de/svn</root>
@@ -14,9 +14,9 @@
<depth>infinity</depth>
</wc-info>
<commit
- revision="3329">
-<author>stoecker</author>
-<date>2010-06-10T07:53:42.765279Z</date>
+ revision="3592">
+<author>bastiK</author>
+<date>2010-10-05T18:34:31.990675Z</date>
</commit>
</entry>
</info>
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..7f85661 100644
--- a/josm-0-disable_oauth.patch
+++ b/josm-0-disable_oauth.patch
@@ -1,11 +1,11 @@
-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
+diff -uNr josm-0-3592-original/build.xml josm-0/build.xml
+--- josm-0-3592-original/build.xml 2010-10-02 09:25:32.000000000 +0200
++++ josm-0/build.xml 2010-10-07 19:04:29.741006661 +0200
@@ -99,7 +99,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>
@@ -15,13 +15,21 @@ diff -uNr josm-0-3376-original/build.xml josm-0/build.xml
<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
+@@ -231,6 +231,7 @@
+ <classpath path="tools/animal-sniffer-ant-tasks-1.5.jar" />
+ </typedef>
+
++
+ <delete dir="${dir}"/>
+
+ <mkdir dir="${dir}"/>
+diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
+--- josm-0-3592-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-10-07 19:06:39.974006768 +0200
@@ -15,7 +15,7 @@
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.io.ChangesetClosedException;
@@ -85,19 +93,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;
-
- import org.openstreetmap.josm.Main;
+diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/gui/MainApplication.java josm-0/src/org/openstreetmap/josm/gui/MainApplication.java
+--- josm-0-3592-original/src/org/openstreetmap/josm/gui/MainApplication.java 2010-09-18 17:43:30.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/gui/MainApplication.java 2010-10-07 19:07:41.757006720 +0200
+@@ -35,7 +35,7 @@
+ import org.openstreetmap.josm.data.AutosaveTask;
+ import org.openstreetmap.josm.data.Preferences;
+ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-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 @@
+@@ -187,7 +187,7 @@
DefaultAuthenticator.createInstance(CredentialsManagerFactory.getCredentialManager());
Authenticator.setDefault(DefaultAuthenticator.getInstance());
ProxySelector.setDefault(new DefaultProxySelector(ProxySelector.getDefault()));
@@ -106,9 +114,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-3592-original/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
+--- josm-0-3592-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 2010-10-07 19:09:01.691006362 +0200
@@ -39,7 +39,7 @@
/** the panel for the basic authentication parameters */
private BasicAuthenticationPreferencesPanel pnlBasicAuthPreferences;
@@ -183,9 +191,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-3592-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
+--- josm-0-3592-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 2010-10-07 19:10:43.491881624 +0200
@@ -6,7 +6,7 @@
import java.util.logging.Logger;
@@ -210,7 +218,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 +265,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-3592-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
+--- josm-0-3592-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 2010-10-07 19:12:45.976006671 +0200
@@ -25,13 +25,17 @@
import javax.swing.JTextField;
@@ -365,26 +373,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 +397,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 +405,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 +413,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 +421,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-3592-original/src/org/openstreetmap/josm/io/auth/CredentialsManager.java josm-0/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
+--- josm-0-3592-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-10-07 19:13:22.002006397 +0200
@@ -4,7 +4,7 @@
import java.net.PasswordAuthentication;
import java.net.Authenticator.RequestorType;
@@ -444,9 +449,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-3592-original/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java josm-0/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java
+--- josm-0-3592-original/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java 2010-09-04 15:52:04.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java 2010-10-07 19:14:02.398006630 +0200
@@ -7,7 +7,7 @@
import java.util.Map;
@@ -456,7 +461,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,7 +469,7 @@ 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 @@
+@@ -150,14 +151,14 @@
return null;
return new OAuthToken(accessTokenKey, accessTokenSecret);
}
@@ -481,15 +486,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 +167,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-3592-original/src/org/openstreetmap/josm/io/OsmConnection.java josm-0/src/org/openstreetmap/josm/io/OsmConnection.java
+--- josm-0-3592-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-10-07 19:14:57.042006535 +0200
@@ -12,12 +12,12 @@
import java.nio.charset.CharsetEncoder;
import java.util.logging.Logger;
@@ -541,9 +546,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-3592-original/src/org/openstreetmap/josm/tools/ExceptionUtil.java josm-0/src/org/openstreetmap/josm/tools/ExceptionUtil.java
+--- josm-0-3592-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 2010-10-07 19:16:01.070881526 +0200
@@ -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..58a28aa 100644
--- a/josm-0-remove_metadata-extractor.patch
+++ b/josm-0-remove_metadata-extractor.patch
@@ -1,5 +1,5 @@
---- build.xml.origine 2010-06-22 20:15:14.253810000 +0200
-+++ build.xml 2010-06-22 20:16:36.211934671 +0200
+--- build.xml.original 2010-10-07 19:20:09.022959000 +0200
++++ build.xml 2010-10-07 19:22:42.330972739 +0200
@@ -96,9 +96,6 @@ Build-Date: ${build.tstamp}
</manifest>
<zipfileset dir="images" prefix="images" />
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-0.3592svn.tar.gz b/josm-0.3592svn.tar.gz
new file mode 100644
index 0000000..56fb2d0
Binary files /dev/null and b/josm-0.3592svn.tar.gz differ
diff --git a/josm.spec b/josm.spec
index 15e0c3a..45e7474 100644
--- a/josm.spec
+++ b/josm.spec
@@ -1,12 +1,12 @@
#
# spec file for package josm
-%global svn_revision 3376
+%global svn_revision 3592
Name: josm
Version: 0
-Release: 0.9.%{svn_revision}svn%{?dist}
+Release: 0.11.%{svn_revision}svn%{?dist}
Summary: An editor for OpenStreetMap (OSM)
Group: Applications/Internet
License: GPLv2+
@@ -17,7 +17,7 @@ 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 +142,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* 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
More information about the scm-commits
mailing list