rpms/xastir/devel xastir-1.9.4-engunits.patch, 1.3, 1.4 xastir-1.9.4-libdir.patch, 1.4, 1.5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xastir.spec, 1.17, 1.18
Lucian Langa
lucilanga at fedoraproject.org
Tue Mar 10 18:31:00 UTC 2009
Author: lucilanga
Update of /cvs/pkgs/rpms/xastir/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26292
Modified Files:
.cvsignore sources xastir.spec
Added Files:
xastir-1.9.4-engunits.patch xastir-1.9.4-libdir.patch
Log Message:
* Tue Mar 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.4-7
- downgrade to the latest stable
- add patch for english units
xastir-1.9.4-engunits.patch:
Index: xastir-1.9.4-engunits.patch
===================================================================
RCS file: xastir-1.9.4-engunits.patch
diff -N xastir-1.9.4-engunits.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ xastir-1.9.4-engunits.patch 10 Mar 2009 18:30:28 -0000 1.4
@@ -0,0 +1,50 @@
+diff -Naur xastir-1.9.4/src/main.c xastir-1.9.4-mod/src/main.c
+--- 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-07 08:11:38.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[70];
+ char str_lat[20];
+ char str_long[20];
+ long x, y;
+@@ -3732,11 +3732,11 @@
+
+ strncat(my_text,
+ " ",
+- sizeof(my_text) - strlen(my_text));
++ sizeof(my_text) - strlen(my_text) - 1);
+
+ strncat(my_text,
+ sec_to_loc(x,y),
+- sizeof(my_text) - strlen(my_text));
++ sizeof(my_text) - strlen(my_text) - 1);
+
+ // begin dist/bearing
+ if ( do_dbstatus ) {
+@@ -3785,19 +3785,19 @@
+
+ strncat(my_text,
+ " ",
+- sizeof(my_text) - strlen(my_text));
++ sizeof(my_text) - strlen(my_text) - 1);
+
+ strncat(my_text,
+ temp_my_distance,
+- sizeof(my_text) - strlen(my_text));
++ sizeof(my_text) - strlen(my_text) - 1);
+
+ strncat(my_text,
+ " ",
+- sizeof(my_text) - strlen(my_text));
++ sizeof(my_text) - strlen(my_text) - 1);
+
+ strncat(my_text,
+ temp_my_course,
+- sizeof(my_text) - strlen(my_text));
++ sizeof(my_text) - strlen(my_text) - 1);
+ }
+
+ XmTextFieldSetString(textarea, my_text);
xastir-1.9.4-libdir.patch:
Index: xastir-1.9.4-libdir.patch
===================================================================
RCS file: xastir-1.9.4-libdir.patch
diff -N xastir-1.9.4-libdir.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ xastir-1.9.4-libdir.patch 10 Mar 2009 18:30:29 -0000 1.5
@@ -0,0 +1,20 @@
+--- 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/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 21 Dec 2008 16:11:51 -0000 1.4
+++ .cvsignore 10 Mar 2009 18:30:28 -0000 1.5
@@ -1 +1 @@
-xastir-1.9.5.tar.gz
+xastir-1.9.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 21 Dec 2008 16:11:51 -0000 1.4
+++ sources 10 Mar 2009 18:30:28 -0000 1.5
@@ -1 +1 @@
-5108519683614e15c81bf78db4f75a38 xastir-1.9.5.tar.gz
+415a19df810d0b28ac61aa444c3e7e0a xastir-1.9.4.tar.gz
Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xastir.spec 26 Feb 2009 07:43:03 -0000 1.17
+++ xastir.spec 10 Mar 2009 18:30:29 -0000 1.18
@@ -1,14 +1,15 @@
Summary: Amateur Station Tracking and Reporting system for amateur radio
Name: xastir
-Version: 1.9.5
-Release: 3%{?dist}
+Epoch: 1
+Version: 1.9.4
+Release: 7%{?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.5-libdir.patch
-Patch1: xastir-1.9.5-IM.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
@@ -27,7 +28,7 @@
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .libdir
-%patch1 -p1 -b .im
+%patch1 -p1 -b .engunits
%build
#./bootstrap.sh
@@ -73,7 +74,6 @@
%defattr(-,root,root,-)
%{_bindir}/xastir
%{_bindir}/xastir_udp_client
-%{_bindir}/testdbfawk
%{_bindir}/callpass
%{_mandir}/man1/xastir.*
%{_datadir}/xastir
@@ -84,6 +84,10 @@
%doc README.MAPS README.win32 UPGRADE
%changelog
+* Tue Mar 10 2009 Lucian Langa <cooly at gnome.eu.org> - 1:1.9.4-7
+- downgrade to the latest stable
+- add patch for english units
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the fedora-extras-commits
mailing list