rpms/xastir/devel xastir.desktop, NONE, 1.1 xastir.png, NONE, 1.1 xastir.spec, 1.1, 1.2

[Lucian Langa (lucilanga)]

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9425

Modified Files:
	xastir.spec 
Added Files:
	xastir.desktop xastir.png 
Log Message:
xastir icon + wget support


--- NEW FILE xastir.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xastir
GenericName=Xastir
Comment=Amateur Station Tracking and Reporting system for amateur radio
Exec=xastir
Icon=xastir.png
Terminal=false
Type=Application
Categories=HamRadio;
Version=1.0


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xastir.spec	1 Mar 2008 08:16:26 -0000	1.1
+++ xastir.spec	8 Mar 2008 16:54:01 -0000	1.2
@@ -1,13 +1,17 @@
 Summary   : Amateur Station Tracking and Reporting system for amateur radio
 Name      : xastir
 Version   : 1.9.2
-Release   : 2%{?dist}
+Release   : 4%{?dist}
 License   : GPLv2
 Group     : Applications/Internet
-Source    : http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
+Source0   : http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
+Source1   : %{name}.desktop
+Source2   : %{name}.png
 Patch0    : xastir-1.9.2-libdir.patch
 URL       : http://www.xastir.org
 BuildRoot : %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires : wget
+BuildRequires : wget
 BuildRequires : lesstif-devel
 BuildRequires : libXt-devel
 BuildRequires : festival
@@ -19,6 +23,7 @@
 BuildRequires : proj-devel
 BuildRequires : python
 BuildRequires : shapelib-devel
+BuildRequires : desktop-file-utils
 
 %description
 Xastir is a graphical application that interfaces HAM radio
@@ -33,6 +38,10 @@
 
 %build
 #./bootstrap.sh
+#aclocal
+#autoheader
+#autoconf
+#automake -a -c
 %configure --without-graphicsmagick --with-rtree
 make %{?_smp_mflags}
 for f in README ChangeLog ; do
@@ -50,6 +59,11 @@
 rm -rf %{buildroot}/usr/share/doc
 #remove gpx2shape because of unsupported dependency Geo::Shapelib
 rm %{buildroot}/usr/share/xastir/gpx2shape
+mkdir -p %{buildroot}/usr/share/pixmaps/
+cp %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+desktop-file-install --vendor="fedora" \
+        --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
+
 
 
 %clean
@@ -63,19 +77,30 @@
 %{_mandir}/man1/xastir.*
 %attr(0644,root,root) %{_datadir}/xastir/Coordinate.pm
 %{_datadir}/xastir
-%{_datadir}/xastir/help
+#%{_libdir}/xastir
+##%{_datadir}/xastir/help
 #%{_datadir}/xastir/config
-%{_datadir}/xastir/symbols
-%{_datadir}/xastir/maps
+##%{_datadir}/xastir/symbols
+##%{_datadir}/xastir/maps
 #%{_datadir}/xastir/Counties
 #%{_datadir}/xastir/fcc
 #%{_datadir}/xastir/GNIS
 #%{_datadir}/xastir/sounds
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/applications/*%{name}.desktop
 %doc AUTHORS ChangeLog COPYING DEBUG_LEVELS FAQ LICENSE
 %doc README README.Contributing README.CVS README.Getting-Started
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
+* Sat Mar  8 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.2-4
+- Install correct xastir icon
+- Misc cleanups
+- Rebuild with wget support
+
+* Sat Mar  2 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.2-3
+- Added desktop and icon file
+
 * Sat Feb 23 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.2-2
 - Moved scripts from libdir to datadir