rpms/qlandkarte/F-8 .cvsignore, 1.3, 1.4 qlandkarte.spec, 1.3, 1.4 sources, 1.4, 1.5 qlandkarte.desktop, 1.1, NONE qlandkarte.xpm, 1.1, NONE

[Dan Horak (sharkcz)]

Author: sharkcz

Update of /cvs/pkgs/rpms/qlandkarte/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31472

Modified Files:
	.cvsignore qlandkarte.spec sources 
Removed Files:
	qlandkarte.desktop qlandkarte.xpm 
Log Message:
* Mon May 19 2008 Dan Horak <dan[at]danny.cz> 0.7.2-1
- upgrade to 0.7.2
- use supplied icons and desktop file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkarte/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Feb 2008 17:12:47 -0000	1.3
+++ .cvsignore	20 May 2008 06:40:14 -0000	1.4
@@ -1 +1 @@
-QLandkarte-0.7.1.tar.gz
+QLandkarte-0.7.2.tar.gz


Index: qlandkarte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkarte/F-8/qlandkarte.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qlandkarte.spec	17 Feb 2008 17:12:47 -0000	1.3
+++ qlandkarte.spec	20 May 2008 06:40:14 -0000	1.4
@@ -1,7 +1,7 @@
 %define cap_name QLandkarte
 
 Name: qlandkarte
-Version: 0.7.1
+Version: 0.7.2
 Release: 1%{?dist}
 Summary: A tool to visualize maps and other GPS information for Garmin devices
 
@@ -9,8 +9,6 @@
 License: GPLv2+
 URL: http://qlandkarte.sourceforge.net/
 Source0: http://downloads.sourceforge.net/%{name}/%{cap_name}-%{version}.tar.gz
-Source1: %{name}.desktop
-Source2: %{name}.xpm
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: qt4-devel proj-devel libusb-devel desktop-file-utils
@@ -34,7 +32,10 @@
 rm -rf %{buildroot}
 make install INSTALL_ROOT=%{buildroot}
 
-install -m 0644 -p -D %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.xpm
+for d in 16x16 32x32
+do
+    install -m 0644 -p -D src/icons/%{cap_name}$d.png %{buildroot}%{_datadir}/icons/hicolor/$d/apps/%{name}.png
+done
 rm -rf %{buildroot}%{_datadir}/menu
 rm  %{buildroot}%{_datadir}/applications/%{name}.desktop
 mkdir -p %{buildroot}%{_mandir}/man1
@@ -42,13 +43,26 @@
 
 desktop-file-install --vendor fedora \
         --dir %{buildroot}%{_datadir}/applications \
-        %{SOURCE1}
+        %{name}.desktop
 
 
 %clean
 rm -rf %{buildroot}
 
 
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files
 %defattr(-, root, root)
 %doc copying changelog.txt
@@ -56,11 +70,15 @@
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/%{name}.xpm
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_mandir}/man1/%{name}.*
 
 
 %changelog
+* Mon May 19 2008 Dan Horak <dan[at]danny.cz> 0.7.2-1
+- upgrade to 0.7.2
+- use supplied icons and desktop file
+
 * Sun Feb 17 2008 Dan Horak <dan[at]danny.cz> 0.7.1-1
 - upgrade to 0.7.1
 - fixes RH #426807 (many thanks goes to Albrecht who did all the work


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkarte/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Feb 2008 17:12:47 -0000	1.4
+++ sources	20 May 2008 06:40:14 -0000	1.5
@@ -1 +1 @@
-f35ef02217d77ae203c33cdd25fd8c33  QLandkarte-0.7.1.tar.gz
+97a261c3296061e66a959ef9d714bdd1  QLandkarte-0.7.2.tar.gz


--- qlandkarte.desktop DELETED ---


--- qlandkarte.xpm DELETED ---