rpms/xastir/F-9 xastir-1.9.4-engunits.patch, NONE, 1.1 xastir-1.9.4-libdir.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xastir.spec, 1.9, 1.10 xastir-1.9.2-libdir.patch, 1.1, NONE xastir-1.9.2-wget.patch, 1.1, NONE

[Lucian Langa]

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29607

Modified Files:
	.cvsignore sources xastir.spec 
Added Files:
	xastir-1.9.4-engunits.patch xastir-1.9.4-libdir.patch 
Removed Files:
	xastir-1.9.2-libdir.patch xastir-1.9.2-wget.patch 
Log Message:
* Thu Oct  5 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.4-1
- new upstream 1.9.4
- drop wget and IM patch (fixed upstream)
- fix for #435762
- preserver timestamps on modified files

xastir-1.9.4-engunits.patch:

--- NEW FILE xastir-1.9.4-engunits.patch ---
--- xastir-1.9.4/src/main.c	2008-08-01 03:09:18.000000000 +0300
+++ xastir-1.9.4-mod/src/main.c	2008-10-04 22:03:58.000000000 +0300
@@ -3663,7 +3663,7 @@
 
 
 static void TrackMouse( /*@unused@*/ Widget w, XtPointer clientData, XEvent *event, /*@unused@*/ Boolean *flag) {
-    char my_text[50];
+    char my_text[60];
     char str_lat[20];
     char str_long[20];
     long x, y;

xastir-1.9.4-libdir.patch:

--- NEW FILE xastir-1.9.4-libdir.patch ---
--- xastir-1.9.4/scripts/Makefile.am	2008-06-24 18:48:59.000000000 +0300
+++ xastir-1.9.4-mod/scripts/Makefile.am	2008-09-08 11:59:39.000000000 +0300
@@ -3,7 +3,7 @@
 # Copyright (C) 2000-2008  The Xastir Group
 #
 
-pkglib_SCRIPTS = \
+pkgdata_SCRIPTS = \
     Coordinate.pm \
     coord-convert.pl \
     get-fcc-rac.pl \
@@ -34,7 +34,7 @@
     Xastir_tigerpoly.py
 
 
-EXTRA_DIST = $(pkglib_SCRIPTS)
+EXTRA_DIST = $(pkgdata_SCRIPTS)
 
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Mar 2008 08:16:26 -0000	1.2
+++ .cvsignore	5 Oct 2008 09:44:00 -0000	1.3
@@ -1 +1 @@
-xastir-1.9.2.tar.gz
+xastir-1.9.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Mar 2008 08:16:26 -0000	1.2
+++ sources	5 Oct 2008 09:44:00 -0000	1.3
@@ -1 +1 @@
-8608afa8f8f0c441a37ba72aeeccdcac  xastir-1.9.2.tar.gz
+415a19df810d0b28ac61aa444c3e7e0a  xastir-1.9.4.tar.gz


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/F-9/xastir.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xastir.spec	28 Aug 2008 16:52:15 -0000	1.9
+++ xastir.spec	5 Oct 2008 09:44:00 -0000	1.10
@@ -1,33 +1,22 @@
 Summary   : Amateur Station Tracking and Reporting system for amateur radio
 Name      : xastir
-Version   : 1.9.2
-Release   : 9%{?dist}
+Version   : 1.9.4
+Release   : 1%{?dist}
 License   : GPLv2
 Group     : Applications/Internet
 Source0   : http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
 Source1   : %{name}.desktop
 Source2   : %{name}.png
-Patch0    : xastir-1.9.2-libdir.patch
-Patch1    : xastir-1.9.2-wget.patch
+Patch0    : xastir-1.9.4-libdir.patch
+Patch1    : xastir-1.9.4-engunits.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
-BuildRequires : ImageMagick-devel
-BuildRequires : dos2unix
-BuildRequires : libax25-devel
-BuildRequires : curl-devel
-BuildRequires : pcre-devel
-BuildRequires : proj-devel
-BuildRequires : python
-BuildRequires : shapelib-devel
-BuildRequires : gpsman
-BuildRequires : gdal-devel
-BuildRequires : db4-devel
-BuildRequires : desktop-file-utils
+BuildRequires : wget, lesstif-devel, libXt-devel, festival
+BuildRequires : ImageMagick-devel, dos2unix, libax25-devel
+BuildRequires : curl-devel, pcre-devel, proj-devel, python-devel
+BuildRequires : shapelib-devel, gpsman, gdal-devel, db4-devel
+BuildRequires : desktop-file-utils, xorg-x11-utils
 
 %description
 Xastir is a graphical application that interfaces HAM radio
@@ -39,7 +28,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .libdir
-%patch1 -p1 -b .wget
+%patch1 -p1 -b .engunits
 
 %build
 #./bootstrap.sh
@@ -47,14 +36,15 @@
 #autoheader
 #autoconf
 #automake -a -c
-%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}
@@ -69,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}
 
 
@@ -85,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
@@ -101,6 +82,12 @@
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
+* Thu Oct  5 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.4-1
+- new upstream 1.9.4
+- drop wget and IM patch (fixed upstream)
+- fix for #435762
+- preserver timestamps on modified files
+
 * Thu Aug 28 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.2-9
 - drop uneeded and potential risky files (bug #460429)
 


--- xastir-1.9.2-libdir.patch DELETED ---


--- xastir-1.9.2-wget.patch DELETED ---