From fa911d46ae2f16c8cbac984f9c01e7d977ca00e6 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Jan 29 2016 01:07:35 +0000 Subject: Patched for GCC 6 and rebuilt for Boost 1.60 --- diff --git a/spec-100-gcc6.patch b/spec-100-gcc6.patch new file mode 100644 index 0000000..1ef5bb3 --- /dev/null +++ b/spec-100-gcc6.patch @@ -0,0 +1,10 @@ +--- spring_100.0/rts/Game/Camera.cpp.orig 2016-01-29 00:37:33.381159185 +0000 ++++ spring_100.0/rts/Game/Camera.cpp 2016-01-29 00:40:23.032599057 +0000 +@@ -1,6 +1,7 @@ + /* This file is part of the Spring engine (GPL v2 or later), see LICENSE.html */ + + #include ++#include // for std::abs(float) + + #include "Camera.h" + #include "UI/MouseHandler.h" diff --git a/spring.spec b/spring.spec index 11ffb56..322cdad 100644 --- a/spring.spec +++ b/spring.spec @@ -6,7 +6,7 @@ # installer/builddata/bitmaps/README.txt. Name: spring Version: 100.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Multiplayer, 3D realtime strategy combat game Group: Amusements/Games License: GPLv2+ and GPLv3+ and LGPLv2 and GFDL and (GFDL or CC-BY) @@ -18,7 +18,9 @@ Source1: spring-README.Fedora Patch0: spring-98-dso.patch Patch1: spring-100-assimp-remove.patch # Upstream bug report: https://springrts.com/mantis/view.php?id=4679 -Patch2: spring-100-cmake3.patch +Patch2: spring-100-cmake3.patch +# Fix build with gcc6 +Patch3: spec-100-gcc6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,6 +55,7 @@ great resource, read it here: http://spring.clan-sy.com/wiki/Main_Page %patch0 -p0 -b .spring-98-dso-fix %patch1 -p0 -b .spring-98-assimp-remove %patch2 -p0 -b .cmake3 +%patch3 -p1 -b .gcc6 cp -p %{SOURCE1} README.Fedora touch ./rts/build/cmake/FindAllegro.cmake @@ -163,6 +166,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 29 2016 Jonathan Wakely 100.0-3 +- Patched for GCC 6 and rebuilt for Boost 1.60 + * Thu Jan 14 2016 Adam Jackson - 100.0-2 - Rebuild for glew 1.13