diff --git a/warzone2100-ssprintf.patch b/warzone2100-ssprintf.patch new file mode 100644 index 0000000..d7de0a3 --- /dev/null +++ b/warzone2100-ssprintf.patch @@ -0,0 +1,13 @@ +Make g++ happy. + +--- a/src/frontend.cpp 2016-07-10 19:36:14.000000000 +0200 ++++ b/src/frontend.cpp 2016-07-12 13:32:08.154269378 +0200 +@@ -378,7 +378,7 @@ static void startCampaignSelector() + QList list = readCampaignFiles(); + for (int i = 0; i < list.size(); i++) + { +- ssprintf(hackList[i], list[i].name.toUtf8().constData()); // since widget system is crazy and takes pointers not copies ++ ssprintf(hackList[i], "%s", list[i].name.toUtf8().constData()); // since widget system is crazy and takes pointers not copies + addTextButton(FRONTEND_CAMPAIGN_1 + i, FRONTEND_POS1X, FRONTEND_POS2Y + 40 * i, hackList[i], WBUT_TXTCENTRE); + } + addSideText(FRONTEND_SIDETEXT, FRONTEND_SIDEX, FRONTEND_SIDEY, _("CAMPAIGNS")); diff --git a/warzone2100.spec b/warzone2100.spec index d0a30c4..f867df5 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,5 +1,5 @@ Name: warzone2100 -Version: 3.1.5 +Version: 3.2.0 Release: 1%{?dist} Summary: Innovative 3D real-time strategy @@ -9,14 +9,17 @@ URL: http://wz2100.net/ Source0: http://downloads.sourceforge.net/project/%{name}/releases/%{version}/%{name}-%{version}.tar.xz Source1: http://downloads.sourceforge.net/project/%{name}/%{name}/Videos/low-quality-en/sequences.wz +Patch0: warzone2100-ssprintf.patch + BuildRequires: physfs-devel >= 2.0 -BuildRequires: qt-devel >= 4.0 +BuildRequires: qt5-qt3d-devel qt5-qtbase-devel qt5-qtscript-devel qt5-qtx11extras-devel BuildRequires: glew-devel >= 1.5.2 -BuildRequires: SDL_net-devel openal-soft-devel bison flex zip -BuildRequires: libpng-devel libogg-devel libvorbis-devel +BuildRequires: SDL2_net-devel openal-soft-devel bison flex zip +BuildRequires: libXrandr-devel libpng-devel libogg-devel libvorbis-devel BuildRequires: quesoglc-devel popt-devel gettext libtheora-devel BuildRequires: automake >= 1.8 BuildRequires: desktop-file-utils +BuildRequires: openssl-devel %description Warzone 2100 was an innovative 3D real-time strategy game back in 1999, and @@ -37,6 +40,7 @@ Video file for %{name} %prep %setup -q +%patch0 -p1 %build %configure --disable-rpath --enable-debug=no --with-distributor="Fedora" @@ -106,6 +110,9 @@ install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %{_datadir}/%{name}/sequences.wz %changelog +* Tue Jul 12 2016 Jan Synáček - 3.2.0-1 +- Update to 3.2.0 (#1354227) + * Tue Apr 12 2016 Jan Synáček - 3.1.5-1 - Update to 3.1.5 (#1325926)