From b5817e759b26e1ae12b882b9747328a6c0575101c506cb73045da35b861c08ea Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Sat, 2 Dec 2017 06:57:35 +0000
Subject: [PATCH] Accepting request 547281 from
 home:mimi_vx:branches:Application:Geo

remove qt devel subpackage

OBS-URL: https://build.opensuse.org/request/show/547281
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=116
---
 gpsd.changes |  1 -
 gpsd.spec    | 20 ++++----------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/gpsd.changes b/gpsd.changes
index 998d92a..dd8a3cb 100644
--- a/gpsd.changes
+++ b/gpsd.changes
@@ -3,7 +3,6 @@ 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
diff --git a/gpsd.spec b/gpsd.spec
index f692c81..379710d 100644
--- a/gpsd.spec
+++ b/gpsd.spec
@@ -115,16 +115,6 @@ Group:          System/Libraries
 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/C and C++
-Requires:       %{libQgps} = %{version}
-Requires:       %{libgps} = %{version}
-
-%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
@@ -189,8 +179,8 @@ 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}"
-export CXXFLAGS="%{optflags} -std=c++11"
-export CPPFLAGS="%{optflags} -std=c++11"
+export CXXFLAGS="%{optflags}"
+export CPPFLAGS="%{optflags}"
 
 pyversions=( python2 python3 )
 pylibdir=( %{python2_sitearch} %{python3_sitearch} )
@@ -231,8 +221,8 @@ done
 %install
 # The SCons description does not handle CXXFLAGS correctly, pass C++ flags also in CFLAGS
 export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags} -std=c++11"
-export CPPFLAGS="%{optflags} -std=c++11"
+export CXXFLAGS="%{optflags}"
+export CPPFLAGS="%{optflags}"
 # Install python2 first
 pushd %{name}-%{version}/python2/%{name}-%{version}
 
@@ -334,8 +324,6 @@ sed -i -e 's#Icon=.*/\([^/]\+\)\(\..\+\)#Icon=\1#' %{buildroot}%{_datadir}/appli
 %{_includedir}/libgpsmm.h
 %{_libdir}/libgps.so
 %{_libdir}/pkgconfig/libgps.pc
-
-%files -n %{libQgps}-devel
 %{_libdir}/libQgpsmm.so
 %{_libdir}/libQgpsmm.prl
 %{_libdir}/pkgconfig/Qgpsmm.pc