[flare] Adapted to newly uploaded tar

[Erik Schilling]

commit 7dc41af9d214670b95c5a400f8c005f0b414625f
Author: Erik Schilling <ablu.erikschilling at googlemail.com>
Date:   Mon Apr 1 21:11:57 2013 +0200

    Adapted to newly uploaded tar
    
    The old one was really broken. So upstream provided a new one

 .gitignore   |    1 +
 flare-README |   71 ----------------------------------------------------------
 flare.spec   |   25 +++++++++-----------
 sources      |    2 +-
 4 files changed, 13 insertions(+), 86 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f2cebd..ca63d4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /flare_linux_v017_1.tar.gz
 /flare_src_v018.tar.gz
+/flare-0.18.tar.gz
diff --git a/flare.spec b/flare.spec
index 949745c..e526325 100644
--- a/flare.spec
+++ b/flare.spec
@@ -1,16 +1,11 @@
-%global tarversion src_v018
-
 Name:       flare
 Version:    0.18
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A single player, 2D-isometric, action Role-Playing Game
 License:    GPLv3+
 URL:        http://www.flarerpg.org
-Source0:    http://downloads.sourceforge.net/project/%{name}-game/%{name}_%{tarversion}.tar.gz
+Source0:    http://downloads.sourceforge.net/project/%{name}-game/%{name}-%{version}.tar.gz
 Source1:    %{name}.6
-# Upstream release is broken. It has a symlink from README.md to README but
-# README is missing for some reason. This is the original file from the repo
-Source2:    %{name}-README
 
 # unifont is not packaged in Fedora. So I use Dejavu.
 Patch0:     %{name}-font-replace.patch
@@ -18,6 +13,8 @@ Patch0:     %{name}-font-replace.patch
 # Upstream does not want to do cmake option to do this
 # so we need to do it manually :(
 Patch1:     %{name}-system-sdl-gfx.patch
+# See https://github.com/clintbellanger/flare-game/pull/286
+Patch2:     %{name}-utf8-fix.patch
 
 Requires:       %{name}-data = %{version}-%{release}
 
@@ -69,20 +66,16 @@ preferred (png, ogg). The game code is C++.
 This package contains the game data. 
 
 %prep
-%setup -q -n %{name}_%{tarversion}
+%setup -q
 %patch0 -p1
 %patch1 -p1
-
-cp -p %{SOURCE2} README
+%patch2 -p1
 
 # Remove scripts that is not needed in installation
 rm -f mods/*/languages/xgettext.py*
 # This is an odd script/readme hybrid
 # It is only required for updating the translations, so I will remove it too
 rm -f mods/*/languages/readme.txt
-# Odd files that should not even be in the release tarball
-find mods/ -name "._*" -delete
-find mods/ -name ".DS_Store" -delete
 
 # Empty file in this release
 rm mods/fantasycore/items/sets.txt
@@ -123,7 +116,7 @@ fi
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
-%doc COPYING README
+%doc COPYING README CREDITS.txt RELEASE_NOTES.txt
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
@@ -189,6 +182,10 @@ fi
 %dir %{_datadir}/%{name}/mods/*/languages
 
 %changelog
+* Mon Apr 1 2013 Erik Schilling <ablu.erikschilling at googlemail.com> 0.18-2
+- Adapted to the newly updated release tar
+- Since the old one was kind of broken and incomplete a new one was generated
+
 * Mon Apr 1 2013 Erik Schilling <ablu.erikschilling at googlemail.com> 0.18-1
 - New upstream release
 - Breaks compatibillity with old save files
diff --git a/sources b/sources
index 52c3186..fbd1874 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6da55df2ee735922a2785b257c3cea4f  flare_src_v018.tar.gz
+4775a845694798f7df8b60b1303b8c37  flare-0.18.tar.gz