rpms/josm/devel .cvsignore, 1.2, 1.3 josm-0-disable_oauth.patch, 1.1, 1.2 josm.spec, 1.4, 1.5 sources, 1.2, 1.3
Cédric OLIVIER
cquad at fedoraproject.org
Wed Jul 21 22:10:49 UTC 2010
Author: cquad
Update of /cvs/pkgs/rpms/josm/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27994
Modified Files:
.cvsignore josm-0-disable_oauth.patch josm.spec sources
Log Message:
Update to 3376 svn revision
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/josm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 17 Jun 2010 05:48:07 -0000 1.2
+++ .cvsignore 21 Jul 2010 22:10:48 -0000 1.3
@@ -1 +1 @@
-josm-0.3329svn.tar.gz
+josm-0.3376svn.tar.gz
josm-0-disable_oauth.patch:
build.xml | 4 -
src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java | 15 ++--
src/org/openstreetmap/josm/gui/MainApplication.java | 4 -
src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java | 14 +++-
src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java | 10 ++-
src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java | 31 +++++++---
src/org/openstreetmap/josm/io/OsmConnection.java | 14 ++--
src/org/openstreetmap/josm/io/auth/CredentialsManager.java | 6 -
src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java | 8 +-
src/org/openstreetmap/josm/tools/ExceptionUtil.java | 10 ++-
10 files changed, 80 insertions(+), 36 deletions(-)
Index: josm-0-disable_oauth.patch
===================================================================
RCS file: /cvs/pkgs/rpms/josm/devel/josm-0-disable_oauth.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- josm-0-disable_oauth.patch 17 Jun 2010 05:48:08 -0000 1.1
+++ josm-0-disable_oauth.patch 21 Jul 2010 22:10:49 -0000 1.2
@@ -1,7 +1,7 @@
-diff -uNr josm-origine/build.xml josm-0/build.xml
---- josm-origine/build.xml 2010-06-15 22:43:34.244992770 +0200
-+++ josm-0/build.xml 2010-06-15 22:42:34.288117927 +0200
-@@ -54,7 +54,6 @@
+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 @@
<!-- All jar files necessary to run only JOSM (no tests) -->
<zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
@@ -9,7 +9,7 @@ diff -uNr josm-origine/build.xml josm-0/
</jar>
</target>
-@@ -74,7 +73,8 @@
+@@ -119,7 +118,8 @@
<target name="compile" depends="init">
<javac srcdir="src" classpathref="classpath" destdir="build"
@@ -19,9 +19,9 @@ diff -uNr josm-origine/build.xml josm-0/
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:unchecked"/>
</javac>
-diff -uNr josm-origine/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
---- josm-origine/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-06-15 22:41:22.492992808 +0200
+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
@@ -15,7 +15,7 @@
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.io.ChangesetClosedException;
@@ -85,9 +85,9 @@ diff -uNr josm-origine/src/org/openstree
if (e instanceof OsmApiException) {
OsmApiException oae = (OsmApiException) e;
-diff -uNr josm-origine/src/org/openstreetmap/josm/gui/MainApplication.java josm-0/src/org/openstreetmap/josm/gui/MainApplication.java
---- josm-origine/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-06-15 22:41:22.493993190 +0200
+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;
@@ -106,9 +106,9 @@ diff -uNr josm-origine/src/org/openstree
// asking for help? show help and exit
if (args.containsKey("help")) {
-diff -uNr josm-origine/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
---- josm-origine/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-06-15 22:41:22.494992795 +0200
+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
@@ -39,7 +39,7 @@
/** the panel for the basic authentication parameters */
private BasicAuthenticationPreferencesPanel pnlBasicAuthPreferences;
@@ -183,9 +183,9 @@ diff -uNr josm-origine/src/org/openstree
+*/
}
}
-diff -uNr josm-origine/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
---- josm-origine/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-06-15 22:41:22.494992795 +0200
+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
@@ -6,7 +6,7 @@
import java.util.logging.Logger;
@@ -257,9 +257,9 @@ diff -uNr josm-origine/src/org/openstree
}
/**
-diff -uNr josm-origine/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
---- josm-origine/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-06-15 22:41:22.495992797 +0200
+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
@@ -25,13 +25,17 @@
import javax.swing.JTextField;
@@ -416,9 +416,9 @@ diff -uNr josm-origine/src/org/openstree
}
}
-diff -uNr josm-origine/src/org/openstreetmap/josm/io/auth/CredentialsManager.java josm-0/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
---- josm-origine/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-06-15 22:41:22.495992797 +0200
+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
@@ -4,7 +4,7 @@
import java.net.PasswordAuthentication;
import java.net.Authenticator.RequestorType;
@@ -444,11 +444,11 @@ diff -uNr josm-origine/src/org/openstree
- public void storeOAuthAccessToken(OAuthToken accessToken) throws CredentialsManagerException;
+// public void storeOAuthAccessToken(OAuthToken accessToken) throws CredentialsManagerException;
}
-diff -uNr josm-origine/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java josm-0/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java
---- josm-origine/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java 2010-03-05 10:54:39.000000000 +0100
-+++ josm-0/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java 2010-06-15 22:41:22.496992824 +0200
-@@ -5,7 +5,7 @@
- import java.net.Authenticator.RequestorType;
+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
+@@ -7,7 +7,7 @@
+ import java.util.Map;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.oauth.OAuthToken;
@@ -456,7 +456,7 @@ diff -uNr josm-origine/src/org/openstree
import org.openstreetmap.josm.gui.io.CredentialDialog;
import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel;
-@@ -112,6 +112,7 @@
+@@ -141,6 +141,7 @@
* @return the current OAuth Access Token to access the OSM server.
* @throws CredentialsManagerException thrown if something goes wrong
*/
@@ -464,7 +464,7 @@ diff -uNr josm-origine/src/org/openstree
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);
-@@ -119,14 +120,14 @@
+@@ -148,14 +149,14 @@
return null;
return new OAuthToken(accessTokenKey, accessTokenSecret);
}
@@ -481,15 +481,15 @@ diff -uNr josm-origine/src/org/openstree
if (accessToken == null) {
Main.pref.put("oauth.access-token.key", null);
Main.pref.put("oauth.access-token.secret", null);
-@@ -135,4 +136,5 @@
+@@ -164,4 +165,5 @@
Main.pref.put("oauth.access-token.secret", accessToken.getSecret());
}
}
+*/
}
-diff -uNr josm-origine/src/org/openstreetmap/josm/io/OsmConnection.java josm-0/src/org/openstreetmap/josm/io/OsmConnection.java
---- josm-origine/src/org/openstreetmap/josm/io/OsmConnection.java 2010-02-15 09:03:57.000000000 +0100
-+++ josm-0/src/org/openstreetmap/josm/io/OsmConnection.java 2010-06-15 22:41:22.497992738 +0200
+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
@@ -12,12 +12,12 @@
import java.nio.charset.CharsetEncoder;
import java.util.logging.Logger;
@@ -541,9 +541,9 @@ diff -uNr josm-origine/src/org/openstree
} else {
String msg = tr("Warning: unexpected value for preference ''{0}''. Got ''{1}''.", "osm-server.auth-method", authMethod);
System.err.println(msg);
-diff -uNr josm-origine/src/org/openstreetmap/josm/tools/ExceptionUtil.java josm-0/src/org/openstreetmap/josm/tools/ExceptionUtil.java
---- josm-origine/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-06-15 22:41:22.497992738 +0200
+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
@@ -18,10 +18,10 @@
import java.util.regex.Pattern;
Index: josm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/josm/devel/josm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- josm.spec 22 Jun 2010 19:13:17 -0000 1.4
+++ josm.spec 21 Jul 2010 22:10:49 -0000 1.5
@@ -1,12 +1,12 @@
#
# spec file for package josm
-%global svn_revision 3329
+%global svn_revision 3376
Name: josm
Version: 0
-Release: 0.8.%{svn_revision}svn%{?dist}
+Release: 0.9.%{svn_revision}svn%{?dist}
Summary: An editor for OpenStreetMap (OSM)
Group: Applications/Internet
License: GPLv2+
@@ -38,7 +38,6 @@ BuildArch: noarch
BuildRequires: jpackage-utils
BuildRequires: desktop-file-utils
BuildRequires: ant
-#BuildRequires: jakarta-commons-codec >= 1.3
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: gettext
BuildRequires: metadata-extractor >= 2.3.1
@@ -143,6 +142,8 @@ gtk-update-icon-cache %{_datadir}/icons/
%changelog
+* Wed Jul 21 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.9.3376svn
+- Update to 3376 svn revision
* Tue Jun 22 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.8.3329svn
- According to fedora policies by removing metadata-extractor jar file
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/josm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 17 Jun 2010 05:48:08 -0000 1.2
+++ sources 21 Jul 2010 22:10:49 -0000 1.3
@@ -1 +1 @@
-9ef0717c35c09662c0c63dc6ef7cfab1 josm-0.3329svn.tar.gz
+2f811da4f40a245cc9c82b11890cf4d0 josm-0.3376svn.tar.gz
More information about the scm-commits
mailing list