Accepting request 547148 from home:mimi_vx:branches:Application:Geo

- build with Qt5
- refreshed gpsd-python3.patch
- Qt5 bindings in own subpackage (include own -devel)

OBS-URL: https://build.opensuse.org/request/show/547148
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=114
This commit is contained in:
Martin Pluskal
2017-12-01 15:10:40 +00:00
committed by Git OBS Bridge
parent 3dfb313ec3
commit 4e919f4c40
3 changed files with 42 additions and 10 deletions

View File

@@ -17,7 +17,16 @@ Index: gpsd-3.17/SConstruct
# Release identification begins here
gpsd_version = "3.17"
@@ -354,7 +362,7 @@ for flag in ["LDFLAGS", "SHLINKFLAGS", "
@@ -111,6 +119,8 @@ def filtered_spawn(sh, escape, cmd, args
# Build-control options
#
+Decider('timestamp-match')
+
# Start by reading configuration variables from the cache
opts = Variables('.scons-option-cache')
@@ -354,7 +364,7 @@ for flag in ["LDFLAGS", "SHLINKFLAGS", "
# Keep scan-build options in the environment

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Dec 1 15:05:22 UTC 2017 - mimi.vx@gmail.com
- build with Qt5
- refreshed gpsd-python3.patch
- Qt5 bindings in own subpackage (include own -devel)
-------------------------------------------------------------------
Tue Nov 28 10:40:51 UTC 2017 - mimi.vx@gmail.com

View File

@@ -49,8 +49,9 @@ BuildRequires: scons >= 2.3.0
BuildRequires: systemd-rpm-macros
BuildRequires: update-desktop-files
BuildRequires: xmlto
BuildRequires: pkgconfig(QtCore) >= 4.5.3
BuildRequires: pkgconfig(QtNetwork) >= 4.5.3
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(bluez)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(libusb-1.0)
@@ -114,6 +115,16 @@ Group: Development/Libraries/Python
This package provides the shared Qt library for gpsd and other GPS aware
applications.
%package -n %{libQgps}-devel
Summary: Shared Qt library for GPS applications
Group: Development/Libraries/Python
Requires: %{libQgps} = %{version}-%{release}
Requires: %{libgps} = %{version}-%{release}
%description -n %{libQgps}-devel
This package provides the development files for the C++ and Qt bindings for use
with the libgps library from gpsd.
%package -n python2-gpsd
Summary: Client libraries in C and Python for talking to a running gpsd or GPS
Group: Development/Libraries/Python
@@ -177,8 +188,9 @@ sed -i 's|env.Prepend.*RPATH.*|pass #\0|' python*/%{name}-%{version}/SConstruct
%build
# The SCons description does not handle CXXFLAGS correctly, pass C++ flags also in CFLAGS
export CFLAGS="%{optflags} -fvisibility-inlines-hidden -std=gnu++98"
export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden -std=gnu++98"
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags} -std=c++11"
export CPPFLAGS="%{optflags} -std=c++11"
pyversions=( python2 python3 )
pylibdir=( %{python2_sitearch} %{python3_sitearch} )
@@ -192,7 +204,8 @@ do
dbus_export=yes \
systemd=yes \
libQgpsmm=yes \
debug=yes \
qt=yes \
qt_versioned=5 \
leapfetch=no \
prefix="" \
sysconfdif=%{_sysconfdir} \
@@ -217,8 +230,9 @@ done
%install
# The SCons description does not handle CXXFLAGS correctly, pass C++ flags also in CFLAGS
export CFLAGS="%{optflags} -fvisibility-inlines-hidden -std=gnu++98"
export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden -std=gnu++98"
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags} -std=c++11"
export CPPFLAGS="%{optflags} -std=c++11"
# Install python2 first
pushd %{name}-%{version}/python2/%{name}-%{version}
@@ -306,7 +320,6 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli
%doc %{name}-%{version}/python3/%{name}-%{version}/TODO
%{_mandir}/man?/gpsfake.*
%{_mandir}/man?/gpscat.*
%{_mandir}/man?/libQgps*
%{_mandir}/man?/libgps.*
%{_mandir}/man?/libgpsmm.*
%{_mandir}/man?/srec*
@@ -320,10 +333,13 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli
%{_includedir}/gps.h
%{_includedir}/libgpsmm.h
%{_libdir}/libgps.so
%{_libdir}/pkgconfig/libgps.pc
%files -n %{libQgps}-devel
%{_libdir}/libQgpsmm.so
%{_libdir}/libQgpsmm.prl
%{_libdir}/pkgconfig/libgps*.pc
%{_libdir}/pkgconfig/Qgpsmm.pc
%{_mandir}/man?/libQgps*
%files -n python2-gpsd
%{python_sitearch}/gps/