rpms/gpsd/F-8 zero.patch,NONE,1.1 gpsd.spec,1.18,1.19

Douglas E. Warner (silfreed) fedora-extras-commits at redhat.com
Thu Mar 20 00:53:12 UTC 2008


Author: silfreed

Update of /cvs/pkgs/rpms/gpsd/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16148

Modified Files:
	gpsd.spec 
Added Files:
	zero.patch 
Log Message:
* Wed Mar 19 2008 Douglas E. Warner <silfreed at silfreed.net> - 2.37-2
- moving gpspacket.so python lib to main package
- adding zero.patch to make ZEROIZE error go away on fedora 7


zero.patch:

--- NEW FILE zero.patch ---
--- libgpsd_core.c.orig	2008-03-19 12:11:55.000000000 -0700
+++ libgpsd_core.c	2008-03-19 12:14:28.000000000 -0700
@@ -415,6 +415,7 @@
 	tm.tm_mon++;
 	tm.tm_year %= 100;
     }
+#define ZEROIZE(x)	(isnan(x)!=0 ? 0.0 : x)  
     /*@ -usedef @*/
     (void)snprintf(bufp, len,
 	    "$GPRMC,%02d%02d%02d,%c,%09.4f,%c,%010.4f,%c,%.4f,%.3f,%02d%02d%02d,,",
@@ -426,14 +427,13 @@
 	    ((session->gpsdata.fix.latitude > 0) ? 'N' : 'S'),
 	    degtodm(fabs(session->gpsdata.fix.longitude)),
 	    ((session->gpsdata.fix.longitude > 0) ? 'E' : 'W'),
-#define ZEROIZE(x)	(isnan(x)!=0 ? 0.0 : x)  
 	    ZEROIZE(session->gpsdata.fix.speed * MPS_TO_KNOTS),
 	    ZEROIZE(session->gpsdata.fix.track),
-#undef ZEROIZE
 	    tm.tm_mday,
 	    tm.tm_mon,
 	    tm.tm_year);
     /*@ +usedef @*/
+#undef ZEROIZE
     nmea_add_checksum(bufp);
 }
 


Index: gpsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsd/F-8/gpsd.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gpsd.spec	28 Feb 2008 19:16:18 -0000	1.18
+++ gpsd.spec	20 Mar 2008 00:52:34 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name: gpsd
 Version: 2.37
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Service daemon for mediating access to a GPS
 
 Group: System Environment/Daemons
@@ -13,10 +13,12 @@
 Source2: xgpsspeed.desktop
 Source3: gpsd-logo.png
 Patch0: python-pyexecdir-install-gpsd-2.37.patch
+Patch1: zero.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-devel dbus-glib-devel ncurses-devel xmlto python-devel
 BuildRequires: lesstif-devel libXaw-devel desktop-file-utils
+BuildRequires: python
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -62,6 +64,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 
 %build
@@ -129,6 +132,7 @@
 %{_bindir}/gpsctl
 %{_libdir}/libgps.so.*
 %{python_sitearch}/gps.py*
+%{python_sitearch}/gpspacket.so
 %{_mandir}/man8/gpsd.8*
 %{_mandir}/man1/gpsprof.1*
 %{_mandir}/man1/sirfmon.1*
@@ -145,7 +149,6 @@
 %{_libdir}/libgps.so
 %{_libdir}/pkgconfig/*.pc
 %{python_sitearch}/gpsfake*
-%{python_sitearch}/gpspacket.so
 %{_includedir}/gps.h
 %{_includedir}/libgpsmm.h
 %{_includedir}/gpsd.h
@@ -182,6 +185,10 @@
 
 
 %changelog
+* Wed Mar 19 2008 Douglas E. Warner <silfreed at silfreed.net> - 2.37-2
+- moving gpspacket.so python lib to main package
+- adding zero.patch to make ZEROIZE error go away on fedora 7
+
 * Wed Feb 27 2008 Douglas E. Warner <silfreed at silfreed.net> - 2.37-1
 - update to 2.37
 - removed install-gpsd_config.h.patch




More information about the fedora-extras-commits mailing list