diff --git a/.gitignore b/.gitignore index 3e8a26c..ad1d6e7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ asc-2.2.0.0.tar.bz2 /asc-2.5.0.0.tar.bz2 /asc-2.6.0.0.tar.bz2 /asc-2.6.1.0.tar.bz2 +/asc-2.8.0.2.tar.bz2 diff --git a/asc.desktop b/asc.desktop index 0eb2baf..673895b 100644 --- a/asc.desktop +++ b/asc.desktop @@ -7,3 +7,4 @@ StartupNotify=false Terminal=false Type=Application Categories=Game;StrategyGame; +Keywords=game;strategy;turn-based; diff --git a/asc.spec b/asc.spec index ca5ac49..60d1d5b 100644 --- a/asc.spec +++ b/asc.spec @@ -1,18 +1,18 @@ Name: asc -Version: 2.6.1.0 -Release: 13%{?dist} +Version: 2.8.0.2 +Release: 1%{?dist} Summary: Advanced Strategic Command Group: Amusements/Games License: GPLv2+ URL: http://www.asc-hq.org/ -Source0: http://downloads.sourceforge.net/asc-hq/asc-%{version}.tar.bz2 +Source0: http://terdon.asc-hq.org/asc/builds/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop Source2: %{name}.png BuildRequires: SDL_image-devel SDL_mixer-devel SDL_sound-devel BuildRequires: bzip2-devel libjpeg-devel libsigc++20-devel physfs-devel BuildRequires: libvorbis-devel libpng-devel libtiff-devel boost-devel BuildRequires: freetype-devel expat-devel lua-devel wxGTK-devel libcurl-devel -BuildRequires: desktop-file-utils zip +BuildRequires: gcc gcc-c++ libtool desktop-file-utils zip Requires: hicolor-icon-theme %description @@ -20,10 +20,12 @@ ASC is a free, turn based strategy game. %prep -%setup -q +#bug in upstream tarbal, contains 2.8.0.1 dir instead of 2.8.0.2 +%autosetup -p1 -n asc-2.8.0.1 +autoreconf -ivf sed -i 's|$datadir/games/|$datadir/|g' configure sed -i 's|$(datadir)/games/|$(datadir)/|g' `find -name Makefile.in` -chmod -x source/libs/paragui/include/paragui.h +chmod -x source/libs/paragui/include/paragui.h source/unitcostcalculator-pbp.cpp %build @@ -37,9 +39,6 @@ make %{?_smp_mflags} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \ -%if 0%{?fedora} && 0%{?fedora} < 19 - --vendor fedora \ -%endif %{SOURCE1} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps @@ -60,6 +59,17 @@ install -p -m 644 %{SOURCE2} \ %changelog +* Tue Feb 27 2018 Hans de Goede - 2.8.0.2-1 +- New upstream version 2.8.0.2 (rhbz#1543419) + * Fixed crash on 32 bit system when more than 32 terrain bits + were defined + * Add safety checks for graphics allocation errors of big maps + * Prevent duplicate objects from being shown on object + construction/removal + * New unit cost formula for PBP + * New terrain type: Concrete + * Fixed some crashes + * Wed Feb 07 2018 Hans de Goede - 2.6.1.0-13 - Fix FTBFS diff --git a/sources b/sources index 9a6a575..e05c4a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8668c378e730e982458d5c082e7e0ca asc-2.6.1.0.tar.bz2 +SHA512 (asc-2.8.0.2.tar.bz2) = 90b770294bb476336a2735620f703103ee6f0ccff258d9ff341bf2edbd97bc6ad987ad102ea2cc24176bb634e77b9237ee6481365921c6353e0ec3220ce2f498