From 5bec2560486f4d23f5f5e919b74b6e8ff9209719 Mon Sep 17 00:00:00 2001 From: Felix Kaechele heffer@fedoraproject.org Date: Thu, 30 Jun 2016 15:08:18 -0700 Subject: update to 1.6.1
- drop GCC 6 patch --- openttd-1.5.3-gcc6.patch | 11 ----------- openttd.spec | 8 +++++--- 2 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 openttd-1.5.3-gcc6.patch
diff --git a/openttd-1.5.3-gcc6.patch b/openttd-1.5.3-gcc6.patch deleted file mode 100644 index 65d9991..0000000 --- a/openttd-1.5.3-gcc6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openttd-1.5.3/src/safeguards.h.orig 2016-02-02 16:21:10.378533175 +0000 -+++ openttd-1.5.3/src/safeguards.h 2016-02-02 16:21:15.269555568 +0000 -@@ -21,6 +21,8 @@ - #ifndef SAFEGUARDS_H - #define SAFEGUARDS_H - -+#include <stdlib.h> -+ - /* Use MallocT instead. */ - #define malloc SAFEGUARD_DO_NOT_USE_THIS_METHOD - diff --git a/openttd.spec b/openttd.spec index b63fb44..ee70291 100644 --- a/openttd.spec +++ b/openttd.spec @@ -2,7 +2,7 @@ #%%global prever RC1
Name: openttd -Version: 1.6.0 +Version: 1.6.1 Release: 1%{?prever}%{?dist} Summary: Transport system simulation game
@@ -10,7 +10,6 @@ Group: Amusements/Games License: GPLv2 URL: http://www.openttd.org Source0: http://binaries.openttd.org/releases/%%7Bversion%7D%%7B?prever:-%%7Bprever%7... -Patch0: openttd-1.5.3-gcc6.patch
BuildRequires: desktop-file-utils, SDL-devel, libpng-devel, unzip, zlib-devel BuildRequires: fontconfig-devel, libtimidity-devel, libicu-devel, lzo-devel @@ -37,7 +36,6 @@ the AI.
%prep %setup -q -n %{name}-%{version}%{?prever:-%{prever}} -%patch0 -p1
%build @@ -147,6 +145,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog +* Thu Jun 30 2016 Felix Kaechele heffer@fedoraproject.org - 1.6.1-1 +- update to 1.6.1 +- drop GCC 6 patch + * Mon May 23 2016 Felix Kaechele heffer@fedoraproject.org - 1.6.0-1 - update to 1.6.0