rpms/xastir/F-8 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
Lucian Langa
lucilanga at fedoraproject.org
Sun Oct 5 10:16:19 UTC 2008
Author: lucilanga
Update of /cvs/pkgs/rpms/xastir/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4098
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
Log Message:
* Thu Oct 5 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.4-1
- new upstream 1.9.4
- misc cleanups
- fix for #435762
- preserve timestamps of 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-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 2 Mar 2008 16:51:29 -0000 1.2
+++ .cvsignore 5 Oct 2008 10:15:48 -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-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 2 Mar 2008 16:51:29 -0000 1.2
+++ sources 5 Oct 2008 10:15:48 -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-8/xastir.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xastir.spec 28 Aug 2008 16:50:18 -0000 1.9
+++ xastir.spec 5 Oct 2008 10:15:48 -0000 1.10
@@ -1,31 +1,20 @@
Summary : Amateur Station Tracking and Reporting system for amateur radio
Name : xastir
-Version : 1.9.2
-Release : 8%{?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
+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 : wget, lesstif-devel, libXt-devel, festival, ImageMagick-devel
+BuildRequires : dos2unix, libax25-devel, curl-devel, pcre-devel, proj-devel
+BuildRequires : python-devel, shapelib-devel, gpsman, gdal-devel, db4-devel
BuildRequires : desktop-file-utils
%description
@@ -38,6 +27,7 @@
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .libdir
+%patch1 -p1 -b .engunits
%build
#./bootstrap.sh
@@ -45,14 +35,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}
@@ -83,15 +74,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
@@ -99,6 +81,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
+- misc cleanups
+- fix for #435762
+- preserve timestamps of modified files
+
* Thu Aug 28 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.2-8
- drop uneeded and potential risky files (bug #460429)
--- xastir-1.9.2-libdir.patch DELETED ---
More information about the fedora-extras-commits
mailing list