rpms/xastir/devel xastir.spec,1.11,1.12

[Lucian Langa]

Author: lucilanga

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

Modified Files:
	xastir.spec 
Log Message:
* Sat Oct 05 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.4-4
- misc cleanups


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xastir.spec	4 Oct 2008 19:13:38 -0000	1.11
+++ xastir.spec	5 Oct 2008 09:45:27 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Amateur Station Tracking and Reporting system for amateur radio
 Name:    xastir
 Version: 1.9.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group:   Applications/Internet
 Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
@@ -36,14 +36,15 @@
 #autoconf
 #automake -a -c
 autoreconf -i -f
-%configure --without-graphicsmagick --with-rtree --with-geotiff=/usr/include/libgeotiff
+%configure --without-graphicsmagick --with-geotiff=/usr/include/libgeotiff
 make %{?_smp_mflags}
 for f in README ChangeLog ; do
     mv $f $f.iso88591
     iconv -o $f -f iso88591 -t utf8 $f.iso88591
+    touch -r $f.iso88591 $f
     rm -f $f.iso88591
 done
-dos2unix scripts/toporama250k.pl 
+dos2unix -k scripts/toporama250k.pl 
 
 %install
 rm -rf %{buildroot}
@@ -58,7 +59,7 @@
 rm %{buildroot}/usr/share/xastir/get_shapelib.sh
 mkdir -p %{buildroot}/usr/share/pixmaps/
 cp %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
-desktop-file-install --vendor="fedora" \
+desktop-file-install \
         --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 
 
@@ -74,15 +75,6 @@
 %{_mandir}/man1/xastir.*
 %attr(0644,root,root) %{_datadir}/xastir/Coordinate.pm
 %{_datadir}/xastir
-#%{_libdir}/xastir
-##%{_datadir}/xastir/help
-#%{_datadir}/xastir/config
-##%{_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
@@ -90,6 +82,9 @@
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
+* Sat Oct 05 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.4-4
+- misc cleanups
+
 * Sat Oct 04 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.4-3
 - fix for RH #435762