Hello community, here is the log from the commit of package gpsd for openSUSE:Factory checked in at 2015-03-16 06:56:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpsd (Old) and /work/SRC/openSUSE:Factory/.gpsd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpsd" Changes: -------- --- /work/SRC/openSUSE:Factory/gpsd/gpsd.changes 2015-01-22 21:48:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gpsd.new/gpsd.changes 2015-03-16 06:56:34.000000000 +0100 @@ -1,0 +2,38 @@ +Sat Mar 7 12:13:48 UTC 2015 - [email protected] + +- Cleanup spec file with spec-cleaner +- Add gpg signature +- Add gpsd-3.13-ntpshm.patch +- Install unit files +- Update to 3.13 + * compiler.h inclusion removed for gps.h so it's standalone + for /usr/include. + * TOFF JSON report gives the offset between GPS top of second and + clock time. + * A new ntpmon tool supports capturing clock samples from NTP + SHM segments. +- Changes for 3.12 + * The daemon's power utilization has been reduced by changing + from non-blocking to blocking I/O; this may be significant + on mobile devices. + * Better protection against false matches of Inland AIS messages; + thisrequired a libgps version bump to 22 (as a side effect, + per-devicefootprint has decreased). + * PPS feature is no longer markedexperimental/unstable. + * Sentence tag fields have been dropped from the JSON reports. + * GNSS and GLONASS SKY reports are now merged. + * Addressed versions of AIS Type 25 and 26 are now handled. + * The 'nmea' build option is now 'nmea0183'. + * New 'minimal' option sets all boolean options not explicitly + set on the build command line to false. + * The 'limited_max_devices' option is now 'max_devices'; the + 'limited_max_clients' option is now 'max_clients' + * The previously deprecated 'libQgpsmm' option has been + removed; use 'qt'. + * A bug fix for error modeling when NMEA 0183 reports empty DOP fields. + * On OS X, the "osx-pl203" driver has been explicitly listed + as unsupported. + * The last remnants of the old pre-JSON query protocol have + been removed from the client library. + +------------------------------------------------------------------- Old: ---- gpsd-3.11.tar.gz New: ---- gpsd-3.13-ntpshm.patch gpsd-3.13.tar.gz gpsd-3.13.tar.gz.sig gpsd.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpsd.spec ++++++ --- /var/tmp/diff_new_pack.InYJ0D/_old 2015-03-16 06:56:35.000000000 +0100 +++ /var/tmp/diff_new_pack.InYJ0D/_new 2015-03-16 06:56:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gpsd # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,31 @@ # +%define libgps libgps22 +%define libQgps libQgpsmm22 %if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 -%define _udevdir /usr/lib/udev/ +%define _udevdir %{_libexecdir}/udev/ %else %define _udevdir /lib/udev/ %endif - Name: gpsd +Version: 3.13 +Release: 0 Summary: Service daemon for mediating access to a GPS License: BSD-3-Clause Group: Hardware/Other Url: http://www.catb.org/gpsd/ -Version: 3.11 -Release: 0 -%define libgps libgps21 -%define libQgps libQgpsmm21 -Requires: udev -Requires(pre): coreutils %fillup_prereq +Source0: http://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz +Source98: http://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz.sig +Source1: rules.gpsd +Source2: udev.gpsd +Source3: sysconfig.gpsd +Source4: gpsd.xpm +Source5: xgps.desktop +Source6: xgpsspeed.desktop +Source99: %{name}.keyring +Patch0: gpsd-fix-shebang.patch +Patch1: gpsd-3.13-ntpshm.patch BuildRequires: bluez-devel BuildRequires: chrpath BuildRequires: dbus-1-glib-devel @@ -47,14 +55,13 @@ BuildRequires: udev BuildRequires: update-desktop-files BuildRequires: xmlto -Source: http://download-mirror.savannah.gnu.org/releases/gpsd/%{name}-%{version}.tar.gz -Source1: rules.gpsd -Source2: udev.gpsd -Source3: sysconfig.gpsd -Source4: gpsd.xpm -Source5: xgps.desktop -Source6: xgpsspeed.desktop -Patch0: gpsd-fix-shebang.patch +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd-rpm-macros +%systemd_requires +%endif +Requires: udev +Requires(pre): %fillup_prereq +Requires(pre): coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -78,47 +85,42 @@ %package devel Summary: Client libraries in C and Python for talking to a running gpsd or GPS Group: Development/Libraries/C and C++ -Requires: %name = %version +Requires: %{name} = %{version} Requires: pkgconfig Requires: python-curses -Requires: python-gpsd = %version +Requires: python-gpsd = %{version} %description devel This package provides C header files for the gpsd shared libraries that manage access to a GPS for applications and debugging tools. You will need to have gpsd installed for it to work. - -%package -n %libgps +%package -n %{libgps} Summary: Shared library for GPS applications Group: Development/Libraries/Python -%description -n %libgps +%description -n %{libgps} This package provides the shared library for gpsd and other GPS aware applications. - -%package -n %libQgps +%package -n %{libQgps} Summary: Shared Qt library for GPS applications Group: Development/Libraries/Python -%description -n %libQgps +%description -n %{libQgps} This package provides the shared Qt library for gpsd and other GPS aware applications. - - %package -n python-gpsd Summary: Client libraries in C and Python for talking to a running gpsd or GPS Group: Development/Libraries/Python -Requires: %name = %version -%{py_requires} +Requires: %{name} = %{version} +%py_requires %description -n python-gpsd This package provides python modules and tools for the gpsd shared libraries. You will need to have gpsd installed for it to work. - %package clients Summary: Clients for gpsd with an X interface Group: Hardware/Other @@ -141,26 +143,27 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 # don't set RPATH sed -i 's|env.Prepend.*RPATH.*|pass #\0|' SConstruct %build -export CFLAGS="%optflags -fvisibility-inlines-hidden" -export CXXFLAGS="%optflags -fvisibility-inlines-hidden" +export CFLAGS="%{optflags} -fvisibility-inlines-hidden" +export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden" scons prefix=%{_prefix} libdir=%{_libdir} strip=False %install -export CFLAGS="%optflags -fvisibility-inlines-hidden" -export CXXFLAGS="%optflags -fvisibility-inlines-hidden" +export CFLAGS="%{optflags} -fvisibility-inlines-hidden" +export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden" DESTDIR=%{buildroot} scons prefix=%{_prefix} libdir=%{_libdir} strip=False install install -d -m 755 %{buildroot}%{_udevdir} install -d -m 755 %{buildroot}%{_udevdir}/rules.d -install -d -m 755 %{buildroot}/var/adm/fillup-templates +install -d -m 755 %{buildroot}%{_localstatedir}/adm/fillup-templates install -d -m 755 %{buildroot}%{_datadir}/{applications,pixmaps} install -m 644 %{SOURCE1} %{buildroot}%{_udevdir}/rules.d/51-gpsd.rules install -m 755 %{SOURCE2} %{buildroot}%{_udevdir}/gpsd.sh -install -m 644 %{SOURCE3} %{buildroot}/var/adm/fillup-templates +install -m 644 %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates if [ -f %{buildroot}%{python_sitearch}/*.egg-info ] ; then rm -f %{buildroot}%{python_sitearch}/*.egg-info fi @@ -169,25 +172,49 @@ install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/%{name}.xpm install -m 644 %{SOURCE5} %{buildroot}%{_datadir}/applications/ install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/applications/ +%if 0%{?suse_version} >= 1210 +install -D -m 644 systemd/gpsd.service %{buildroot}/%{_unitdir}/gpsd.service +install -D -m 644 systemd/gpsd.socket %{buildroot}/%{_unitdir}/gpsd.socket +install -D -m 644 systemd/[email protected] %{buildroot}/%{_unitdir}/[email protected] +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcgpsd +%endif + %suse_update_desktop_file xgpsspeed %suse_update_desktop_file xgps # save some space, create symlinks -%fdupes -s %buildroot -#chrpath -r %{_libdir} %{buildroot}%{python_sitearch}/gps/*.so +%fdupes -s %{buildroot} + +%pre +%if 0%{?suse_version} >= 1210 +%service_add_pre gpsd.service [email protected] +%endif %post /sbin/ldconfig %fillup_only -n gpsd +%if 0%{?suse_version} >= 1210 +%service_add_post gpsd.service [email protected] +%udev_rules_update +%endif + +%preun +%if 0%{?suse_version} >= 1210 +%service_del_preun gpsd.service [email protected] +%endif -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig +%if 0%{?suse_version} >= 1210 +%service_del_postun gpsd.service [email protected] +%endif -%post -n %libgps -p /sbin/ldconfig +%post -n %{libgps} -p /sbin/ldconfig -%postun -n %libgps -p /sbin/ldconfig +%postun -n %{libgps} -p /sbin/ldconfig -%post -n %libQgps -p /sbin/ldconfig +%post -n %{libQgps} -p /sbin/ldconfig -%postun -n %libQgps -p /sbin/ldconfig +%postun -n %{libQgps} -p /sbin/ldconfig %files %defattr(-,root,root) @@ -198,17 +225,23 @@ %{_mandir}/man?/gpsinit.* %{_udevdir}/gpsd.sh %{_udevdir}/rules.d/* +%if 0%{?suse_version} >= 1210 +%{_unitdir}/gpsd.service +%{_unitdir}/gpsd.socket +%{_unitdir}/[email protected] +%{_sbindir}/rcgpsd +%endif %{_sbindir}/gpsd %{_sbindir}/gpsdctl %{_bindir}/gpsctl %{_libdir}/libgpsd.so.* -/var/adm/fillup-templates/sysconfig.gpsd +%{_localstatedir}/adm/fillup-templates/sysconfig.gpsd -%files -n %libgps +%files -n %{libgps} %defattr(-,root,root) %{_libdir}/libgps.so.* -%files -n %libQgps +%files -n %{libQgps} %defattr(-,root,root) %{_libdir}/libQgpsmm.so.* @@ -251,6 +284,7 @@ %{_mandir}/man?/gpspipe.* %{_mandir}/man?/gpsmon.* %{_mandir}/man?/gps2udp.* +%{_mandir}/man?/ntpmon.* %{_bindir}/gegps %{_bindir}/xgps %{_bindir}/xgpsspeed ++++++ gpsd-3.13-ntpshm.patch ++++++ >From 861d148321aafa3f7dadb1da4f507da83ba2f846 Mon Sep 17 00:00:00 2001 From: Mike Frysinger <[email protected]> Date: Thu, 26 Feb 2015 17:39:23 -0500 Subject: [PATCH] ntpshm: fix status type --- ntpshm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntpshm.h b/ntpshm.h index c8cd3b6..45648a8 100644 --- a/ntpshm.h +++ b/ntpshm.h @@ -60,7 +60,7 @@ enum segstat_t { OK, NO_SEGMENT, NOT_READY, BAD_MODE, CLASH}; struct shm_stat_t { - int status; + enum segstat_t status; struct timespec tvc, tvr, tvt; int precision; int leap; -- 2.3.0 ++++++ gpsd-3.11.tar.gz -> gpsd-3.13.tar.gz ++++++ ++++ 109242 lines of diff (skipped) ++++++ gpsd-fix-shebang.patch ++++++ --- /var/tmp/diff_new_pack.InYJ0D/_old 2015-03-16 06:56:36.000000000 +0100 +++ /var/tmp/diff_new_pack.InYJ0D/_new 2015-03-16 06:56:36.000000000 +0100 @@ -1,6 +1,7 @@ -diff -Nur gpsd-2.95.orig/gps/gps.py gpsd-2.95/gps/gps.py ---- gpsd-2.95.orig/gps/gps.py 2010-06-09 00:44:50.000000000 +0200 -+++ gpsd-2.95/gps/gps.py 2010-10-26 14:27:50.000000000 +0200 +Index: gpsd-3.13/gps/gps.py +=================================================================== +--- gpsd-3.13.orig/gps/gps.py ++++ gpsd-3.13/gps/gps.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
