rpms/xastir/devel xastir-1.9.8-gdal.patch, NONE, 1.1 xastir-1.9.8-libdir.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xastir.spec, 1.24, 1.25 xastir-1.9.5-IM.patch, 1.1, NONE xastir-1.9.5-libdir.patch, 1.1, NONE xastir-1.9.6-libdir.patch, 1.1, NONE

[Lucian Langa]

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16102

Modified Files:
	.cvsignore sources xastir.spec 
Added Files:
	xastir-1.9.8-gdal.patch xastir-1.9.8-libdir.patch 
Removed Files:
	xastir-1.9.5-IM.patch xastir-1.9.5-libdir.patch 
	xastir-1.9.6-libdir.patch 
Log Message:
update to latest upstream

xastir-1.9.8-gdal.patch:
 acinclude.m4 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xastir-1.9.8-gdal.patch ---
diff -Naur xastir-1.9.8/acinclude.m4 xastir-1.9.8-mod/acinclude.m4
--- xastir-1.9.8/acinclude.m4	2010-01-31 04:12:23.000000000 +0200
+++ xastir-1.9.8-mod/acinclude.m4	2010-04-14 08:35:39.000000000 +0300
@@ -291,7 +291,7 @@
 # Remove the -lgdal from what gdal-config --libs returns, because AC_CHECK_LIB
 # will put it into LIBS for us.
 #
-   LDFLAGS="$LDFLAGS `${GDAL_BIN} --libs | sed -e 's/-lgdal[^ ]*//'`"
+   LDFLAGS="$LDFLAGS `${GDAL_BIN} --libs | sed -e 's/-lgdal[^ ]*//'` -lhdf5_hl -lhdf5"
    AC_CHECK_HEADERS(gdal.h, [AC_CHECK_LIB(gdal, GDALAllRegister,
                     [use_gdal="yes"
                      LIBS="$LIBS -lgdal"

xastir-1.9.8-libdir.patch:
 Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xastir-1.9.8-libdir.patch ---
diff -Naur xastir-1.9.8/scripts/Makefile.am xastir-1.9.8-mod/scripts/Makefile.am
--- xastir-1.9.8/scripts/Makefile.am	2010-01-31 04:12:23.000000000 +0200
+++ xastir-1.9.8-mod/scripts/Makefile.am	2010-04-14 07:54:51.000000000 +0300
@@ -3,7 +3,7 @@
 # Copyright (C) 2000-2010  The Xastir Group
 #
 
-pkglib_SCRIPTS = \
+pkgdata_SCRIPTS = \
     Coordinate.pm \
     coord-convert.pl \
     get-fcc-rac.pl \
@@ -43,5 +43,5 @@
     xastir-migrate.sh \
     Xastir_tigerpoly.py
 
-EXTRA_DIST = $(pkglib_SCRIPTS)
+EXTRA_DIST = $(pkgdata_SCRIPTS)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Oct 2009 16:34:11 -0000	1.6
+++ .cvsignore	14 Apr 2010 08:06:23 -0000	1.7
@@ -1 +1 @@
-xastir-1.9.6.tar.gz
+xastir-1.9.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Oct 2009 16:34:11 -0000	1.6
+++ sources	14 Apr 2010 08:06:23 -0000	1.7
@@ -1 +1 @@
-78ed29f798c0d9d6ddee26831a1732ea  xastir-1.9.6.tar.gz
+7598a25ada47e322e0aafec1ca242b0c  xastir-1.9.8.tar.gz


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xastir.spec	10 Mar 2010 17:01:01 -0000	1.24
+++ xastir.spec	14 Apr 2010 08:06:25 -0000	1.25
@@ -1,14 +1,16 @@
 Summary: Amateur Station Tracking and Reporting system for amateur radio
 Name:    xastir
 Epoch:   1
-Version: 1.9.6
-Release: 3%{?dist}
+Version: 1.9.8
+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.6-libdir.patch
+Patch0:  xastir-1.9.8-libdir.patch
+#gdal requires hdf5
+Patch1:  xastir-1.9.8-gdal.patch
 URL:     http://www.xastir.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: wget
@@ -27,6 +29,7 @@ software.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .libdir
+%patch1 -p1 -b .gdal
 
 %build
 #./bootstrap.sh
@@ -74,7 +77,9 @@ rm -rf %{buildroot}
 %{_bindir}/xastir_udp_client
 %{_bindir}/callpass
 %{_bindir}/testdbfawk
-%{_mandir}/man1/xastir.*
+%{_mandir}/man1/xastir*.*
+%{_mandir}/man1/callpass.*
+%{_mandir}/man1/testdbfawk.*
 %{_datadir}/xastir
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/%{name}.desktop
@@ -83,6 +88,11 @@ rm -rf %{buildroot}
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
+* Wed Apr 14 2010 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.8-1
+- add patch1 to correctly pick gdal flags
+- update patch0
+- update to latest upstream (1.9.8)
+
 * Wed Mar 10 2010 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.6-3
 - rebuild with newer shapelib and IM
 


--- xastir-1.9.5-IM.patch DELETED ---


--- xastir-1.9.5-libdir.patch DELETED ---


--- xastir-1.9.6-libdir.patch DELETED ---