[josm] Update to 7480 svn revision

[Cédric OLIVIER]

commit 0c445566299f288f8b7b06ec05e678bc2704a673
Author: Cédric OLIVIER <cedric.olivier at free.fr>
Date:   Wed Sep 3 18:56:06 2014 +0200

    Update to 7480 svn revision

 .gitignore   |    1 +
 josm.1       |   65 ----------------------------------------------------------
 josm.desktop |   11 ---------
 josm.spec    |   16 +++++++-------
 sources      |    2 +-
 5 files changed, 10 insertions(+), 85 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 803cce1..695c5aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ josm-0.3376svn.tar.gz
 /josm-0.6502svn.tar.gz
 /josm-0.7000svn.tar.gz
 /josm-0.7347svn.tar.gz
+/josm-0.7480svn.tar.gz
diff --git a/josm.spec b/josm.spec
index 0ae3efd..7594696 100644
--- a/josm.spec
+++ b/josm.spec
@@ -1,21 +1,19 @@
 #
 # spec file for package josm
 
-%global svn_revision 7347
+%global svn_revision 7480
 
 
 Name:           josm
 Version:        0
-Release:        0.54.%{svn_revision}svn%{?dist}
+Release:        0.55.%{svn_revision}svn%{?dist}
 Summary:        An editor for  OpenStreetMap (OSM)
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://josm.openstreetmap.de/
 Source0:        %{name}-%{version}.%{svn_revision}svn.tar.gz
 Source1:        %{name}
-Source2:        %{name}.desktop
-Source3:        %{name}-generate-tarball.sh
-Source4:        %{name}.1
+Source2:        %{name}-generate-tarball.sh
 #Source built using the following commands : ./josm-generate-tarball.sh 3751
 
 #patch to remove metadata-extractor and signpost-core of final jar
@@ -116,10 +114,9 @@ install -Dp -m 755 %SOURCE1 %{buildroot}%{_bindir}/%{name}
 install -d %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
 install -p -m 644 images/logo.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 
-install -Dp -m 644 %SOURCE4 %{buildroot}%{_mandir}/man1/%{name}.1
-
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ %SOURCE2
+install -Dp -m 644 doc/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ linux/tested/%{name}.desktop
 
 
 %clean
@@ -154,6 +151,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Sep 02 2014 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.55.7480svn
+- Update to 7480 svn revision
+
 * Fri Aug 01 2014 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.54.7347svn
 - Update to 7347 svn revision
 
diff --git a/sources b/sources
index e20fcc7..e64d2ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0900eb710309b615861d26f526b6408c  josm-0.7347svn.tar.gz
+7f6800ed447edfc54cdee21f5d1cb80f  josm-0.7480svn.tar.gz