rpms/merkaartor/devel merkaartor.desktop, 1.1, 1.2 merkaartor.spec, 1.6, 1.7 merkaartor.xpm, 1.1, NONE

[Sven Lankes]

Author: slankes

Update of /cvs/pkgs/rpms/merkaartor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24476

Modified Files:
	merkaartor.desktop merkaartor.spec 
Removed Files:
	merkaartor.xpm 
Log Message:
- duplicate icon removed
- minor desktop-file update



Index: merkaartor.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/merkaartor.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- merkaartor.desktop	25 Jul 2008 17:16:52 -0000	1.1
+++ merkaartor.desktop	15 Oct 2008 20:58:20 -0000	1.2
@@ -1,11 +1,13 @@
 [Desktop Entry]
+Type=Application
+Version=1.0
 Encoding=UTF-8
 Name=Merkaartor
-GenericName=OpenStreetMap Editor
-Comment=Open .gpx files
-Exec=merkaartor
+GenericName=Open Street Map Editor
+GenericName[tr]=Açık Sokak Haritası Düzenleyicisi
 Icon=merkaartor
+Exec=merkaartor
 Terminal=false
-Type=Application
-Categories=Graphics;
+StartupNotify=false
+Categories=Education;Science;Geography;Network;Graphics;Qt;
 


Index: merkaartor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/merkaartor/devel/merkaartor.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- merkaartor.spec	13 Oct 2008 19:52:29 -0000	1.6
+++ merkaartor.spec	15 Oct 2008 20:58:20 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           merkaartor
 Version:        0.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Qt-Based OpenStreetMap editor
 
 Group:          Applications/Productivity
@@ -8,7 +8,6 @@
 URL:            http://www.merkaartor.org
 Source0:        http://www.merkaartor.org/downloads/source/merkaartor-0.12.tar.bz2
 Source1:        %{name}.desktop
-Source2:        %{name}.xpm
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel >= 4.4
@@ -36,7 +35,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make INSTALL_ROOT=${RPM_BUILD_ROOT} install
-install -p -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.xpm  
+install -p -m 644 -D Icons/Merkaartor.xpm $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.xpm  
 desktop-file-install --vendor="fedora" \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} 
 
@@ -57,6 +56,10 @@
 
 
 %changelog
+* Wed Oct 15 2008 Sven Lankes <sven at lank.es> - 0.12-2
+- remove additional source merkaartor.xpm - now included
+- minor update of .desktop-file
+
 * Mon Oct 13 2008 Sven Lankes <sven at lank.es> - 0.12-1
 - new upstream release
 - enable geotagging support (requires exiv2)


--- merkaartor.xpm DELETED ---