diff --git a/.gitignore b/.gitignore index 7ef4846..ff2b743 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ asc-2.2.0.0.tar.bz2 /asc-2.4.0.0.tar.bz2 +/asc-2.5.0.0.tar.bz2 diff --git a/asc-2.4.0.0-gcc47.patch b/asc-2.4.0.0-gcc47.patch index 021c657..0df68a0 100644 --- a/asc-2.4.0.0-gcc47.patch +++ b/asc-2.4.0.0-gcc47.patch @@ -1,23 +1,5 @@ --- asc-2.4.0.0/source/graphics/blitter.h 2008-07-11 23:26:58.000000000 +0200 +++ asc-2.4.0.0.new/source/graphics/blitter.h 2012-01-15 14:36:39.753033150 +0100 -@@ -749,7 +748,7 @@ - - void assign ( PixelType src, PixelType* dest ) - { -- if ( isOpaque(src ) ) { -+ if ( this->isOpaque(src ) ) { - *dest = src; - } - }; -@@ -769,7 +768,7 @@ - - void assign ( PixelType src, PixelType* dest ) - { -- if ( isOpaque(src ) ) { -+ if ( this->isOpaque(src ) ) { - *dest = src; - } - }; @@ -928,6 +927,7 @@ }; @@ -37,17 +19,6 @@ }; }; ---- asc-2.4.0.0/source/graphics/surface.cpp 2009-04-04 23:21:47.000000000 +0200 -+++ asc-2.4.0.0.new/source/graphics/surface.cpp 2012-01-14 12:03:26.933912267 +0100 -@@ -579,7 +579,7 @@ - - void assign ( PixelType src, PixelType* dest ) - { -- if ( !isOpaque(src ) ) -+ if ( !this->isOpaque(src ) ) - *dest &= alphamask; - }; - --- asc-2.4.0.0/source/itemrepository.cpp 2009-11-01 12:05:42.000000000 +0100 +++ asc-2.4.0.0.new/source/itemrepository.cpp 2012-01-14 12:06:59.420909604 +0100 @@ -88,7 +88,7 @@ diff --git a/asc.spec b/asc.spec index 815179a..4a1bdf0 100644 --- a/asc.spec +++ b/asc.spec @@ -1,6 +1,6 @@ Name: asc -Version: 2.4.0.0 -Release: 13%{?dist} +Version: 2.5.0.0 +Release: 1%{?dist} Summary: Advanced Strategic Command Group: Amusements/Games License: GPLv2+ @@ -12,31 +12,38 @@ BuildRequires: SDL_image-devel SDL_mixer-devel SDL_sound-devel BuildRequires: bzip2-devel libjpeg-devel libsigc++-devel physfs-devel BuildRequires: libvorbis-devel libpng-devel libtiff-devel boost-devel BuildRequires: freetype-devel expat-devel lua-devel wxGTK-devel -BuildRequires: desktop-file-utils ImageMagick zip +BuildRequires: desktop-file-utils ImageMagick zip libtool Requires: hicolor-icon-theme %description ASC is a free, turn based strategy game. + %prep %setup -q %patch0 -p1 +rm aclocal.m4 +autoreconf -i -f 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 + %build -%configure --enable-genparse --disable-paraguitest --disable-dependency-tracking -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +%configure --enable-genparse --disable-paraguitest make %{?_smp_mflags} convert data/%{name}.ico %{name}.png + %install -%make_install +make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1} +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/16x16/apps mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -m 644 %{name}-1.png \ @@ -57,15 +64,21 @@ fi %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %files %doc README COPYING AUTHORS %{_bindir}/%{name}* %{_datadir}/%{name} -%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/*%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man6/%{name}*.6.gz + %changelog +* Sat Mar 23 2013 Hans de Goede - 2.5.0.0-1 +- New upstream version 2.5.0.0 (rhbz#827946) +- Run autoreconf for aarch64 support (rhbz#925030) + * Sun Feb 10 2013 Rahul Sundaram - 2.4.0.0-13 - remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 - clean up spec to follow current guidelines diff --git a/sources b/sources index 66f9f9c..496315d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c18a7cf84cb53b04527d864301d405d asc-2.4.0.0.tar.bz2 +93400834ef6b75343388c1edc772bef9 asc-2.5.0.0.tar.bz2