[CriticalMass] Fix building with gcc-4.7
Hans de Goede
jwrdegoede at fedoraproject.org
Thu Jan 12 21:24:33 UTC 2012
commit a984297de93d91c4679afa84c200d6a1a2612909
Author: Hans de Goede <hdegoede at redhat.com>
Date: Thu Jan 12 22:25:42 2012 +0100
Fix building with gcc-4.7
CriticalMass-1.5-gcc47.patch | 12 ++++++++++++
CriticalMass.spec | 7 ++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/CriticalMass-1.5-gcc47.patch b/CriticalMass-1.5-gcc47.patch
new file mode 100644
index 0000000..04aa47f
--- /dev/null
+++ b/CriticalMass-1.5-gcc47.patch
@@ -0,0 +1,12 @@
+diff -up CriticalMass-1.5/game/main.cpp~ CriticalMass-1.5/game/main.cpp
+--- CriticalMass-1.5/game/main.cpp~ 2012-01-12 22:17:44.000000000 +0100
++++ CriticalMass-1.5/game/main.cpp 2012-01-12 22:21:55.377006929 +0100
+@@ -141,7 +141,7 @@ void showInfo()
+ {
+ LOG_INFO << "----------------------------------" << endl;
+ LOG_INFO << GAMETITLE << " " << GAMEVERSION
+- << " - "__TIME__" "__DATE__
++ << " - " __TIME__ " " __DATE__
+ << endl;
+ LOG_INFO << "Copyright (C) 2001-2010 by Frank Becker" << endl;
+ LOG_INFO << "Visit http://criticalmass.sourceforge.net" << endl;
diff --git a/CriticalMass.spec b/CriticalMass.spec
index 56473f6..7fe39cd 100644
--- a/CriticalMass.spec
+++ b/CriticalMass.spec
@@ -1,6 +1,6 @@
Name: CriticalMass
Version: 1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: SDL/OpenGL space shoot'em up game also known as critter
Group: Amusements/Games
License: GPLv2+
@@ -9,6 +9,7 @@ Source0: http://downloads.sourceforge.net/criticalmass/%{name}-%{version}
Source1: %{name}.desktop
Patch0: CriticalMass-1.0.2-res-change-rh566533.patch
Patch1: CriticalMass-1.5-libpng15.patch
+Patch2: CriticalMass-1.5-gcc47.patch
BuildRequires: SDL_image-devel SDL_mixer-devel libpng-devel curl-devel
BuildRequires: tinyxml-devel desktop-file-utils
Requires: hicolor-icon-theme opengl-games-utils
@@ -27,6 +28,7 @@ a tiny spacecraft and sent after them.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
sed -i 's/curl-gnutls/curl/g' configure
@@ -79,6 +81,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Thu Jan 12 2012 Hans de Goede <hdegoede at redhat.com> - 1.5-3
+- Fix building with gcc-4.7
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list