Hello community, here is the log from the commit of package SimGear for openSUSE:Factory checked in at 2018-07-24 17:24:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SimGear (Old) and /work/SRC/openSUSE:Factory/.SimGear.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SimGear" Tue Jul 24 17:24:38 2018 rev:7 rq:624571 version:2018.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2018-01-05 01:00:32.345583874 +0100 +++ /work/SRC/openSUSE:Factory/.SimGear.new/SimGear.changes 2018-07-24 17:24:52.539490764 +0200 @@ -1,0 +2,30 @@ +Thu Jul 19 00:44:12 UTC 2018 - stefan.bru...@rwth-aachen.de + +- Adjust BuildRequires and Requires + * Use BuildConflicts to force a OSG version >= 3.2 + * Drop BuildRequires for OSG plugins, not needed + * Add versioned Requires: openSceneGraph-plugins. We want plugins + with the same version as the linked library +- Use %license for COPYING + +------------------------------------------------------------------- +Sun Jul 1 03:21:06 UTC 2018 - stefan.bru...@rwth-aachen.de + +- Fix failing build, no-return-in-nonvoid-function + 0001-Add-missing-return-value.patch +- Change BuildRequires, OpenSceneGraph 3.6 has an incompatible API + +------------------------------------------------------------------- +Wed Jun 27 15:43:30 UTC 2018 - mathias.hom...@opensuse.org + +- Update to 2018.2.2 + * changelog: see upstream, http://wiki.flightgear.org/Changelog_2018.2 + * Fixes boo#1099288 (update requested) + +------------------------------------------------------------------- +Fri May 4 21:52:40 UTC 2018 - mathias.hom...@opensuse.org + +- Update to 2018.1.1 + * changelog: see upstream, http://wiki.flightgear.org/Changelog_2018.1 + +------------------------------------------------------------------- Old: ---- simgear-2017.3.1.tar.bz2 New: ---- 0001-Add-missing-return-value.patch simgear-2018.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SimGear.spec ++++++ --- /var/tmp/diff_new_pack.fleGly/_old 2018-07-24 17:24:55.927495081 +0200 +++ /var/tmp/diff_new_pack.fleGly/_new 2018-07-24 17:24:55.927495081 +0200 @@ -15,27 +15,31 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# We want specific versions of the devel and plugins OpenSceneGraph subpackages +# in our requirements, i.e. the same version we have built against +%define openscenegraph_version %(rpm -qa --nosignature --nodigest libOpenSceneGraph\*-devel | sed 's/.*-devel-\\(.*\\)-.*/\\1/') -%define libname libSimGearCore-2017_3_1 -%define main_version 2017.3 +%define libname libSimGearCore-2018_2_2 +%define main_version 2018.2 Name: SimGear -Version: %{main_version}.1 +Version: %{main_version}.2 Release: 0 Summary: Simulator Construction Gear # https://sourceforge.net/p/flightgear/codetickets/1940/ -License: LGPL-2.0+ and GPL-2.0+ and MIT +License: LGPL-2.0-or-later AND GPL-2.0-or-later AND MIT Group: Amusements/Games/3D/Simulation Url: http://www.flightgear.org/ Source0: https://sourceforge.net/projects/flightgear/files/release-%{main_version}/simgear-%{version}.tar.bz2 -BuildRequires: OpenSceneGraph-plugins >= 3.2 +# PATCH-FIX-UPSTREAM 0001-Add-missing-return-value.patch +Patch0: 0001-Add-missing-return-value.patch BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: libOpenSceneGraph-devel > 1.2 +BuildRequires: libOpenSceneGraph-devel < 3.6 +BuildConflicts: libOpenSceneGraph-devel < 3.2 BuildRequires: pkgconfig BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(openal) -BuildRequires: pkgconfig(openthreads) BuildRequires: pkgconfig(zlib) %if 0%{?suse_version} > 1330 BuildRequires: libboost_headers-devel @@ -54,7 +58,7 @@ %package -n %{libname} Summary: Simulator Construction Gear Group: Amusements/Games/3D/Simulation -Requires: OpenSceneGraph-plugins >= 3.0 +Requires: OpenSceneGraph-plugins = %{openscenegraph_version} %description -n %{libname} SimGear is a set of open-source libraries designed to be used as building @@ -68,9 +72,12 @@ Summary: Development libraries and headers for SimGear Group: Development/Libraries/C and C++ Requires: %{libname} = %{version} -Requires: boost-devel -Requires: libOpenSceneGraph-devel > 1.2 -Requires: libOpenThreads-devel +%if 0%{?suse_version} > 1330 +BuildRequires: libboost_headers-devel +%else +BuildRequires: boost-devel +%endif +Requires: libOpenSceneGraph-devel = %{openscenegraph_version} Requires: libjpeg-devel Requires: openal-soft-devel Requires: zlib-devel @@ -81,6 +88,7 @@ %prep %setup -q -n simgear-%{version} +%patch0 -p1 %build export CFLAGS="%{optflags}" @@ -100,7 +108,7 @@ %postun -n %{libname} -p /sbin/ldconfig %files -n %{libname} -%doc COPYING +%license COPYING %{_libdir}/libSimGear*.so.* %files devel ++++++ 0001-Add-missing-return-value.patch ++++++ >From fbd99514e63b550520d60c65c52d18e16fdd730f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> Date: Sun, 1 Jul 2018 05:17:37 +0200 Subject: [PATCH] Add missing return value Taken from upstream commit 1d7c3984ca2e9a1299c8c546b0d9194073dac556 --- simgear/io/HTTPRepository.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/simgear/io/HTTPRepository.cxx b/simgear/io/HTTPRepository.cxx index 690d562..1d29612 100644 --- a/simgear/io/HTTPRepository.cxx +++ b/simgear/io/HTTPRepository.cxx @@ -90,6 +90,7 @@ namespace simgear case HTTPRepository::REPO_ERROR_CANCELLED: return "cancelled"; case HTTPRepository::REPO_PARTIAL_UPDATE: return "partial update (incomplete)"; } + return "Unknown response code"; } class HTTPRepoPrivate -- 2.18.0 ++++++ simgear-2017.3.1.tar.bz2 -> simgear-2018.2.2.tar.bz2 ++++++ ++++ 20074 lines of diff (skipped)
