From a4c55de59759c7a919baf90b589a3a409050dd0e504aebe22e5e7b50280f503b Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Mon, 23 Apr 2012 11:09:15 +0000 Subject: [PATCH 1/2] update OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=72 --- gpsd-2.96.tar.bz2 | 3 -- gpsd-3.5.tar.bz2 | 3 ++ gpsd-fix-pythondir.patch | 13 ------- gpsd.spec | 79 ++++++++++++++++++++++++++++++---------- 4 files changed, 63 insertions(+), 35 deletions(-) delete mode 100644 gpsd-2.96.tar.bz2 create mode 100644 gpsd-3.5.tar.bz2 delete mode 100644 gpsd-fix-pythondir.patch diff --git a/gpsd-2.96.tar.bz2 b/gpsd-2.96.tar.bz2 deleted file mode 100644 index 6be539a..0000000 --- a/gpsd-2.96.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a67d7db1533d0d7f497a1fa8efab7ed465add117bb1426bc8159e0fb48a1d442 -size 1301001 diff --git a/gpsd-3.5.tar.bz2 b/gpsd-3.5.tar.bz2 new file mode 100644 index 0000000..20aac01 --- /dev/null +++ b/gpsd-3.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b17143bcbb318147a807ece52045b618b6a1d37aab254f3db0d9fac72952e99d +size 1183060 diff --git a/gpsd-fix-pythondir.patch b/gpsd-fix-pythondir.patch deleted file mode 100644 index 7e9a50d..0000000 --- a/gpsd-fix-pythondir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 71860dc..9af87df 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -64,7 +64,7 @@ PYTHONMODULES_DIST = gps/__init__.py gps/misc.py gps/fake.py gps/gps.py gps/clie - - PYTHONPAGES_DIST = gpsprof.1 gpsfake.1 gpscat.1 xgpsspeed.1 xgps.1 - if HAVE_PYTHON --pyexec_PYTHON = gpscap.py -+python_PYTHON = gpscap.py - PYTHONPAGES = $(PYTHONPAGES_DIST) - endif - diff --git a/gpsd.spec b/gpsd.spec index 76350d7..5f1b42f 100644 --- a/gpsd.spec +++ b/gpsd.spec @@ -1,7 +1,7 @@ # # spec file for package gpsd # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,20 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gpsd Summary: Service daemon for mediating access to a GPS License: BSD-3-Clause -Url: http://gpsd.berlios.de/ Group: Hardware/Other -Version: 2.96 +Url: http://www.catb.org/gpsd/ +Version: 3.5 Release: 0 %define libgps libgps20 +%define libQgps libQgpsmm20 Requires: udev PreReq: coreutils %fillup_prereq -BuildRequires: automake +BuildRequires: bluez-devel +BuildRequires: chrpath BuildRequires: gcc-c++ +BuildRequires: libcap-devel +BuildRequires: libqt4-devel >= 4.5.3 +BuildRequires: libusb-1_0-devel BuildRequires: ncurses-devel BuildRequires: python-devel +BuildRequires: scons >= 2.0.1 BuildRequires: udev BuildRequires: update-desktop-files BuildRequires: xmlto @@ -46,7 +53,6 @@ Source4: gpsd.xpm Source5: xgps.desktop Source6: xgpsspeed.desktop Patch0: gpsd-fix-shebang.patch -Patch1: gpsd-fix-pythondir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1110 %else @@ -90,8 +96,9 @@ Authors: 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: pkgconfig +Requires: python-curses Requires: python-gpsd = %version -Requires: pkgconfig, python-curses %description devel This package provides C header files for the gpsd shared libraries that @@ -112,7 +119,7 @@ Authors: Ville Nuorvala -%package -n libgps20 +%package -n %libgps Summary: Shared library for GPS applications Group: Development/Libraries/Python @@ -133,6 +140,27 @@ Authors: Ville Nuorvala +%package -n %libQgps +Summary: Shared Qt library for GPS applications +Group: Development/Libraries/Python + +%description -n %libQgps +This package provides the shared Qt library for gpsd and other GPS aware +applications. + +Authors: +-------- + Remco Treffkorn + Derrick J. Brashear + Russ Nelson + Eric S. Raymond + Gary E. Miller + Jeff Francis + Amaury Jacquot + Chris Kuethe + Ville Nuorvala + + %package -n python-gpsd Summary: Client libraries in C and Python for talking to a running gpsd or GPS Group: Development/Libraries/Python @@ -157,6 +185,7 @@ Authors: %package clients Summary: Clients for gpsd with an X interface +Group: Hardware/Other Requires: python-gtk %description clients @@ -189,18 +218,12 @@ Authors: %prep %setup -q %patch0 -p1 -%patch1 -p1 %build -%configure --disable-static \ -%if 0%{?suse_version} > 1020 - --enable-dbus \ -%endif - --enable-garmintxt -%__make %{?jobs:-j%jobs} +scons prefix=%{_prefix} libdir=%{_libdir} strip=False %install -%makeinstall +DESTDIR=%{buildroot} scons prefix=%{_prefix} libdir=%{_libdir} strip=False install install -d -m 755 %{buildroot}/lib/udev install -d -m 755 %{buildroot}/lib/udev/rules.d install -d -m 755 %{buildroot}/var/adm/fillup-templates @@ -208,7 +231,6 @@ install -d -m 755 %{buildroot}%{_datadir}/{applications,pixmaps} install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d/51-gpsd.rules install -m 755 %{SOURCE2} %{buildroot}/lib/udev/gpsd.sh install -m 644 %{SOURCE3} %{buildroot}/var/adm/fillup-templates -rm -f %{buildroot}%{_libdir}/libgps.la %{buildroot}%{_libdir}/libgpsd.la if [ -f %{buildroot}%{python_sitearch}/*.egg-info ] ; then rm -f %{buildroot}%{python_sitearch}/*.egg-info fi @@ -223,25 +245,35 @@ install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/applications/ %if 0%{?suse_version} > 1020 %fdupes -s %buildroot %endif +chrpath -r %{_libdir} %{buildroot}%{python_sitearch}/gps/*.so %clean rm -rf %{buildroot} -%post +%post +/sbin/ldconfig %fillup_only -n gpsd +%postun -p /sbin/ldconfig + %post -n %libgps -p /sbin/ldconfig %postun -n %libgps -p /sbin/ldconfig +%post -n %libQgps -p /sbin/ldconfig + +%postun -n %libQgps -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README INSTALL COPYING gpsd.php %{_mandir}/man?/gpsd.* +%{_mandir}/man?/gpsdctl.* %{_mandir}/man?/gpsctl.* /lib/udev/gpsd.sh /lib/udev/rules.d/* %{_sbindir}/gpsd +%{_sbindir}/gpsdctl %{_bindir}/gpsctl %{_libdir}/libgpsd.so.* /var/adm/fillup-templates/sysconfig.gpsd @@ -250,14 +282,20 @@ rm -rf %{buildroot} %defattr(-,root,root) %{_libdir}/libgps.so.* +%files -n %libQgps +%defattr(-,root,root) +%{_libdir}/libQgpsmm.so.* + %files devel %defattr(-,root,root) %doc README INSTALL COPYING TODO %{_mandir}/man?/gpsfake.* %{_mandir}/man?/gpscat.* +%{_mandir}/man?/libQgps*.* %{_mandir}/man?/libgps*.* %{_mandir}/man?/srec.* %{_mandir}/man?/gpsdecode.* +%{_mandir}/man?/gpsd_json.* %{_mandir}/man?/gpsprof.* %{_bindir}/gpsfake %{_bindir}/gpscat @@ -265,25 +303,28 @@ rm -rf %{buildroot} %{_bindir}/gpsprof %{_includedir}/gps.h %{_includedir}/libgpsmm.h -%{_includedir}/gpsd.h %{_libdir}/libgps.so %{_libdir}/libgpsd.so +%{_libdir}/libQgpsmm.so +%{_libdir}/libQgpsmm.prl %{_libdir}/pkgconfig/libgps*.pc +%{_libdir}/pkgconfig/Qgpsmm.pc %files -n python-gpsd %defattr(-,root,root) -%{python_sitelib}/gps*.py* %{python_sitearch}/gps/ %files clients %defattr(-,root,root) %{_mandir}/man?/gps.* +%{_mandir}/man?/gegps.* %{_mandir}/man?/cgps.* %{_mandir}/man?/lcdgps.1.gz %{_mandir}/man?/xgps.* %{_mandir}/man?/xgpsspeed.* %{_mandir}/man?/gpspipe.* %{_mandir}/man?/gpsmon.* +%{_bindir}/gegps %{_bindir}/xgps %{_bindir}/xgpsspeed %{_bindir}/cgps From 2f7c72c4b42cfeaa657356cf712a7d15b7a6781e9d6ecc14737fd2801c6598d6 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Mon, 23 Apr 2012 11:18:44 +0000 Subject: [PATCH 2/2] - update to gpsd version 3.5 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=73 --- gpsd.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gpsd.changes b/gpsd.changes index 0c96c0e..14acb34 100644 --- a/gpsd.changes +++ b/gpsd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 23 11:16:40 UTC 2012 - opensuse@dstoecker.de + +- update to gpsd version 3.5 + ------------------------------------------------------------------- Fri Dec 2 16:27:13 UTC 2011 - coolo@suse.com