[flare] Updated to new upstream release
Erik Schilling
ablu at fedoraproject.org
Mon Apr 1 12:34:10 UTC 2013
commit 428c9ff9e55092c1a7edaa9ae3ddb964d8d05891
Author: Erik Schilling <ablu.erikschilling at googlemail.com>
Date: Mon Apr 1 14:29:44 2013 +0200
Updated to new upstream release
.gitignore | 1 +
flare-README | 71 ++++++++++++++++++
flare-font-replace.patch | 35 ++++++---
flare-system-sdl-gfx.patch | 176 ++++++++++++++++++++++++++++----------------
flare.spec | 54 +++++++++++---
sources | 2 +-
6 files changed, 253 insertions(+), 86 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b09aed8..0f2cebd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/flare_linux_v017_1.tar.gz
+/flare_src_v018.tar.gz
diff --git a/flare-README b/flare-README
new file mode 100644
index 0000000..374c9b5
--- /dev/null
+++ b/flare-README
@@ -0,0 +1,71 @@
+# Flare
+
+Flare (Free Libre Action Roleplaying Engine) is a simple game engine built to handle a very specific kind of game: single-player 2D action RPGs. Flare is not a reimplementation of an existing game or engine. It is a tribute to and exploration of the action RPG genre.
+
+Rather than building a very abstract, robust game engine, the goal of this project is to build several real games and harvest an engine from the common, reusable code.
+This is the first game made with the flare-engine featuring a fantasy dungeon crawl game. Currently this game is actively developed.
+
+Flare uses simple file formats (INI style config files) for most of the game data, allowing anyone to easily modify game contents. Open formats are preferred (png, ogg). The game code is C++.
+
+
+
+## Copyright and License
+
+Most of Flare is Copyright © 2010-2013 Clint Bellanger. Contributors retain copyrights to their original contributions.
+
+All of Flare's source code is released under the GNU GPL version 3. Later versions are permitted.
+
+All of Flare's art and data files are released under CC-BY-SA 3.0. Later versions are permitted.
+
+The Liberation Sans fonts version 2 are released under the SIL Open Font License, Version 1.1.
+
+The GNU Unifont font is released under GPL v2, with the exception that embedding the font in a document does not in itself bind that document to the terms of the GPL.
+
+
+## Links
+
+* Homepage http://flarerpg.org
+* Source https://github.com/clintbellanger/flare-engine
+* Forums http://opengameart.org/forums/flare
+* Email clintbellanger at gmail.com
+
+
+## Installation
+
+Please see INSTALL.engine for further steps.
+
+## Running Flare
+
+If the program is installing system-wide (i.e., you typed 'make install' and it worked), you can run it just by executing the 'flare' command.
+
+If you did not perform the installation step, you should find the binary in in the top directory, and run it from there, like this:
+
+ ./flare
+
+Also, in newer versions, the game can be launched from an icon in your main menu in your GUI environment (KDE, GNOME, etc.).
+
+If you're running flare from your operating system's gui file browser (e.g. Windows Explorer or OSX Finder), you'll want to use one of the provided launchers. This helps the flare executable use its own working directory, so it can see all those data folders.
+
+
+
+## Settings
+
+Settings are stored in one of these places:
+
+ $XDG_CONFIG_HOME/flare
+ $HOME/.config/flare
+ ./config
+
+Here you can enable fullscreen, change the game resolution, enable mouse-move, and change keybindings. The settings files are created the first time you run Flare.
+
+
+
+## Save Files
+
+Save files are stored in one of these places:
+
+ $XDG_DATA_HOME/flare
+ $HOME/.local/share/flare
+ ./saves
+
+If permissions are correct, the game is automatically saved when you exit.
diff --git a/flare-font-replace.patch b/flare-font-replace.patch
index 0e81886..2313372 100644
--- a/flare-font-replace.patch
+++ b/flare-font-replace.patch
@@ -1,13 +1,26 @@
-diff -uNr flare_v017_1-orig/mods/fantasycore/engine/languages.txt flare_v017_1/mods/fantasycore/engine/languages.txt
---- flare_v017_1-orig/mods/fantasycore/engine/languages.txt 2012-11-02 18:30:21.319966389 +0100
-+++ flare_v017_1/mods/fantasycore/engine/languages.txt 2012-11-02 18:35:09.162376638 +0100
-@@ -8,7 +8,7 @@
- it=Italiano
+From 7a46d20c2cac27c14f1a60c99ee2b8ef57861273 Mon Sep 17 00:00:00 2001
+From: Erik Schilling <ablu.erikschilling at googlemail.com>
+Date: Mon, 1 Apr 2013 11:56:29 +0200
+Subject: [PATCH 2/2] Changed unifont to DejaVu since Fedora does not have
+ unifont packaged
+
+---
+ mods/fantasycore/engine/languages.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mods/fantasycore/engine/languages.txt b/mods/fantasycore/engine/languages.txt
+index 7f6af9c..051dc32 100644
+--- a/mods/fantasycore/engine/languages.txt
++++ b/mods/fantasycore/engine/languages.txt
+@@ -8,7 +8,7 @@ fi=Suomi
+ fr=Français
gl=Galego
- nl=Nederlands
--ja=Nihongo,unifont-5.1.ttf,12
+ it=Italiano
+-ja=Nihongo
+ja=Nihongo,DejaVuSans.ttf,12
- ru=Русский
- sk=Slovenčina
- fi=Suomi
-Binary files flare_v017_1-orig/mods/fantasycore/engine/.languages.txt.swp and flare_v017_1/mods/fantasycore/engine/.languages.txt.swp differ
+ nb=Norsk Bokmål
+ nl=Nederlands
+ pl=Polski
+--
+1.8.1.4
+
diff --git a/flare-system-sdl-gfx.patch b/flare-system-sdl-gfx.patch
index 9dcc109..d67719e 100644
--- a/flare-system-sdl-gfx.patch
+++ b/flare-system-sdl-gfx.patch
@@ -1,7 +1,34 @@
-diff -uNr flare_v017_1-orig/CMakeLists.txt flare_v017_1/CMakeLists.txt
---- flare_v017_1-orig/CMakeLists.txt 2012-11-02 20:10:33.636702907 +0100
-+++ flare_v017_1/CMakeLists.txt 2012-11-03 00:04:17.329578572 +0100
-@@ -46,6 +46,8 @@
+From cea2271f6610dd56ed02369e5805337010d16689 Mon Sep 17 00:00:00 2001
+From: Erik Schilling <ablu.erikschilling at googlemail.com>
+Date: Mon, 1 Apr 2013 11:55:58 +0200
+Subject: [PATCH 1/2] Use system SDL_gfx
+
+---
+ CMakeLists.txt | 12 +-
+ FindSDL_gfx.cmake | 40 +++
+ src/Avatar.cpp | 2 +-
+ src/FontEngine.cpp | 2 +-
+ src/GameStateLoad.cpp | 2 +-
+ src/SDL_gfxBlitFunc.c | 639 ------------------------------------------------
+ src/SDL_gfxBlitFunc.h | 167 -------------
+ src/WidgetButton.cpp | 2 +-
+ src/WidgetCheckBox.cpp | 2 +-
+ src/WidgetInput.cpp | 2 +-
+ src/WidgetLabel.cpp | 2 +-
+ src/WidgetListBox.cpp | 2 +-
+ src/WidgetScrollBar.cpp | 2 +-
+ src/WidgetScrollBox.cpp | 2 +-
+ src/WidgetSlider.cpp | 2 +-
+ 15 files changed, 61 insertions(+), 819 deletions(-)
+ create mode 100644 FindSDL_gfx.cmake
+ delete mode 100644 src/SDL_gfxBlitFunc.c
+ delete mode 100644 src/SDL_gfxBlitFunc.h
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 40f52ca..68d9f9a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,6 +49,8 @@ EndIf(NOT IS_ABSOLUTE "${DATADIR}")
# Detect missing dependencies
@@ -10,7 +37,7 @@ diff -uNr flare_v017_1-orig/CMakeLists.txt flare_v017_1/CMakeLists.txt
Find_Package (SDL REQUIRED)
If (NOT SDL_FOUND)
Message (FATAL_ERROR "Couldn't find SDL development files. On Debian-based systems (such as Ubuntu) you should install the 'libsdl1.2-dev' package.")
-@@ -74,6 +76,13 @@
+@@ -77,6 +79,13 @@ Else (NOT SDLTTF_FOUND)
Include_Directories (${SDLTTF_INCLUDE_DIR})
EndIf (NOT SDLTTF_FOUND)
@@ -24,7 +51,7 @@ diff -uNr flare_v017_1-orig/CMakeLists.txt flare_v017_1/CMakeLists.txt
# Sources
-@@ -134,7 +143,6 @@
+@@ -141,7 +150,6 @@ Set (FLARE_SOURCES
./src/PowerManager.cpp
./src/QuestLog.cpp
./src/SaveLoad.cpp
@@ -32,7 +59,7 @@ diff -uNr flare_v017_1-orig/CMakeLists.txt flare_v017_1/CMakeLists.txt
./src/Settings.cpp
./src/SharedResources.cpp
./src/StatBlock.cpp
-@@ -171,7 +179,7 @@
+@@ -180,7 +188,7 @@ If (NOT SDLMAIN_LIBRARY)
Set (SDLMAIN_LIBRARY "")
EndIf (NOT SDLMAIN_LIBRARY)
@@ -41,9 +68,11 @@ diff -uNr flare_v017_1-orig/CMakeLists.txt flare_v017_1/CMakeLists.txt
# desktop file
-diff -uNr flare_v017_1-orig/FindSDL_gfx.cmake flare_v017_1/FindSDL_gfx.cmake
---- flare_v017_1-orig/FindSDL_gfx.cmake 1970-01-01 01:00:00.000000000 +0100
-+++ flare_v017_1/FindSDL_gfx.cmake 2012-11-02 20:28:06.573308667 +0100
+diff --git a/FindSDL_gfx.cmake b/FindSDL_gfx.cmake
+new file mode 100644
+index 0000000..1125751
+--- /dev/null
++++ b/FindSDL_gfx.cmake
@@ -0,0 +1,40 @@
+# - Try to find SDL_gfx
+# Once done this will define
@@ -85,11 +114,11 @@ diff -uNr flare_v017_1-orig/FindSDL_gfx.cmake flare_v017_1/FindSDL_gfx.cmake
+IF (NOT SDLGFX_FOUND AND SDL_gfx_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could NOT find SDL_gfx library ${SDLGFX_INCLUDE_DIR}")
+ENDIF (NOT SDLGFX_FOUND AND SDL_gfx_FIND_REQUIRED)
-Binary files flare_v017_1-orig/flare and flare_v017_1/flare differ
-diff -uNr flare_v017_1-orig/src/Avatar.cpp flare_v017_1/src/Avatar.cpp
---- flare_v017_1-orig/src/Avatar.cpp 2012-11-02 20:10:33.719701265 +0100
-+++ flare_v017_1/src/Avatar.cpp 2012-11-02 20:37:09.365693439 +0100
-@@ -23,7 +23,7 @@
+diff --git a/src/Avatar.cpp b/src/Avatar.cpp
+index 6303e87..60e2190 100644
+--- a/src/Avatar.cpp
++++ b/src/Avatar.cpp
+@@ -25,7 +25,7 @@ FLARE. If not, see http://www.gnu.org/licenses/
*/
@@ -98,10 +127,11 @@ diff -uNr flare_v017_1-orig/src/Avatar.cpp flare_v017_1/src/Avatar.cpp
#include "Animation.h"
#include "AnimationManager.h"
#include "AnimationSet.h"
-diff -uNr flare_v017_1-orig/src/FontEngine.cpp flare_v017_1/src/FontEngine.cpp
---- flare_v017_1-orig/src/FontEngine.cpp 2012-11-02 20:10:33.676702111 +0100
-+++ flare_v017_1/src/FontEngine.cpp 2012-11-02 20:37:09.301694737 +0100
-@@ -19,7 +19,7 @@
+diff --git a/src/FontEngine.cpp b/src/FontEngine.cpp
+index f153210..6427527 100644
+--- a/src/FontEngine.cpp
++++ b/src/FontEngine.cpp
+@@ -19,7 +19,7 @@ FLARE. If not, see http://www.gnu.org/licenses/
* class FontEngine
*/
@@ -110,21 +140,24 @@ diff -uNr flare_v017_1-orig/src/FontEngine.cpp flare_v017_1/src/FontEngine.cpp
#include "FontEngine.h"
#include "FileParser.h"
#include "SharedResources.h"
-diff -uNr flare_v017_1-orig/src/GameStateLoad.cpp flare_v017_1/src/GameStateLoad.cpp
---- flare_v017_1-orig/src/GameStateLoad.cpp 2012-11-02 20:10:33.689701855 +0100
-+++ flare_v017_1/src/GameStateLoad.cpp 2012-11-02 20:37:09.320694352 +0100
-@@ -19,7 +19,7 @@
- * GameStateLoad
+diff --git a/src/GameStateLoad.cpp b/src/GameStateLoad.cpp
+index 5683d34..774ecd5 100644
+--- a/src/GameStateLoad.cpp
++++ b/src/GameStateLoad.cpp
+@@ -20,7 +20,7 @@ FLARE. If not, see http://www.gnu.org/licenses/
*/
+ #include "Avatar.h"
-#include "SDL_gfxBlitFunc.h"
+#include <SDL_gfxBlitFunc.h>
#include "FileParser.h"
#include "GameStateLoad.h"
#include "GameStateTitle.h"
-diff -uNr flare_v017_1-orig/src/SDL_gfxBlitFunc.c flare_v017_1/src/SDL_gfxBlitFunc.c
---- flare_v017_1-orig/src/SDL_gfxBlitFunc.c 2012-11-02 20:10:33.706701521 +0100
-+++ flare_v017_1/src/SDL_gfxBlitFunc.c 1970-01-01 01:00:00.000000000 +0100
+diff --git a/src/SDL_gfxBlitFunc.c b/src/SDL_gfxBlitFunc.c
+deleted file mode 100644
+index 96cbd2f..0000000
+--- a/src/SDL_gfxBlitFunc.c
++++ /dev/null
@@ -1,639 +0,0 @@
-/*
-
@@ -765,11 +798,13 @@ diff -uNr flare_v017_1-orig/src/SDL_gfxBlitFunc.c flare_v017_1/src/SDL_gfxBlitFu
-
- return 1;
-}
-diff -uNr flare_v017_1-orig/src/SDL_gfxBlitFunc.h flare_v017_1/src/SDL_gfxBlitFunc.h
---- flare_v017_1-orig/src/SDL_gfxBlitFunc.h 2012-11-02 20:10:33.701701619 +0100
-+++ flare_v017_1/src/SDL_gfxBlitFunc.h 1970-01-01 01:00:00.000000000 +0100
-@@ -1,165 +0,0 @@
--/*
+diff --git a/src/SDL_gfxBlitFunc.h b/src/SDL_gfxBlitFunc.h
+deleted file mode 100644
+index 3603a3c..0000000
+--- a/src/SDL_gfxBlitFunc.h
++++ /dev/null
+@@ -1,167 +0,0 @@
+-/*
-
-SDL_gfxBlitFunc.h: custom blitters
-
@@ -798,6 +833,8 @@ diff -uNr flare_v017_1-orig/src/SDL_gfxBlitFunc.h flare_v017_1/src/SDL_gfxBlitFu
-
-*/
-
+-
+-#pragma once
-#ifndef _SDL_gfxBlitFunc_h
-#define _SDL_gfxBlitFunc_h
-
@@ -934,10 +971,11 @@ diff -uNr flare_v017_1-orig/src/SDL_gfxBlitFunc.h flare_v017_1/src/SDL_gfxBlitFu
-#endif
-
-#endif /* _SDL_gfxBlitFunc_h */
-diff -uNr flare_v017_1-orig/src/WidgetButton.cpp flare_v017_1/src/WidgetButton.cpp
---- flare_v017_1-orig/src/WidgetButton.cpp 2012-11-02 20:10:33.679702053 +0100
-+++ flare_v017_1/src/WidgetButton.cpp 2012-11-02 20:37:09.307694615 +0100
-@@ -21,7 +21,7 @@
+diff --git a/src/WidgetButton.cpp b/src/WidgetButton.cpp
+index 7d53c2d..603f2d8 100644
+--- a/src/WidgetButton.cpp
++++ b/src/WidgetButton.cpp
+@@ -22,7 +22,7 @@ FLARE. If not, see http://www.gnu.org/licenses/
#include "WidgetButton.h"
#include "SharedResources.h"
@@ -946,10 +984,11 @@ diff -uNr flare_v017_1-orig/src/WidgetButton.cpp flare_v017_1/src/WidgetButton.c
using namespace std;
-diff -uNr flare_v017_1-orig/src/WidgetCheckBox.cpp flare_v017_1/src/WidgetCheckBox.cpp
---- flare_v017_1-orig/src/WidgetCheckBox.cpp 2012-11-02 20:10:33.699701659 +0100
-+++ flare_v017_1/src/WidgetCheckBox.cpp 2012-11-02 20:37:09.322694312 +0100
-@@ -28,7 +28,7 @@
+diff --git a/src/WidgetCheckBox.cpp b/src/WidgetCheckBox.cpp
+index d817441..f94300d 100644
+--- a/src/WidgetCheckBox.cpp
++++ b/src/WidgetCheckBox.cpp
+@@ -28,7 +28,7 @@ FLARE. If not, see http://www.gnu.org/licenses/
#include "Widget.h"
#include "WidgetCheckBox.h"
#include "SharedResources.h"
@@ -958,10 +997,11 @@ diff -uNr flare_v017_1-orig/src/WidgetCheckBox.cpp flare_v017_1/src/WidgetCheckB
using namespace std;
-diff -uNr flare_v017_1-orig/src/WidgetInput.cpp flare_v017_1/src/WidgetInput.cpp
---- flare_v017_1-orig/src/WidgetInput.cpp 2012-11-02 20:10:33.676702111 +0100
-+++ flare_v017_1/src/WidgetInput.cpp 2012-11-02 20:37:09.300694758 +0100
-@@ -18,7 +18,7 @@
+diff --git a/src/WidgetInput.cpp b/src/WidgetInput.cpp
+index a7ef910..aff1f60 100644
+--- a/src/WidgetInput.cpp
++++ b/src/WidgetInput.cpp
+@@ -19,7 +19,7 @@ FLARE. If not, see http://www.gnu.org/licenses/
#include "WidgetInput.h"
#include "SharedResources.h"
#include "Settings.h"
@@ -970,10 +1010,11 @@ diff -uNr flare_v017_1-orig/src/WidgetInput.cpp flare_v017_1/src/WidgetInput.cpp
using namespace std;
-diff -uNr flare_v017_1-orig/src/WidgetLabel.cpp flare_v017_1/src/WidgetLabel.cpp
---- flare_v017_1-orig/src/WidgetLabel.cpp 2012-11-02 20:10:33.722701205 +0100
-+++ flare_v017_1/src/WidgetLabel.cpp 2012-11-02 20:37:09.374693257 +0100
-@@ -23,7 +23,7 @@
+diff --git a/src/WidgetLabel.cpp b/src/WidgetLabel.cpp
+index b1bfda9..235057c 100644
+--- a/src/WidgetLabel.cpp
++++ b/src/WidgetLabel.cpp
+@@ -23,7 +23,7 @@ FLARE. If not, see http://www.gnu.org/licenses/
#include "WidgetLabel.h"
#include "SharedResources.h"
@@ -982,10 +1023,11 @@ diff -uNr flare_v017_1-orig/src/WidgetLabel.cpp flare_v017_1/src/WidgetLabel.cpp
#include "UtilsParsing.h"
using namespace std;
-diff -uNr flare_v017_1-orig/src/WidgetListBox.cpp flare_v017_1/src/WidgetListBox.cpp
---- flare_v017_1-orig/src/WidgetListBox.cpp 2012-11-02 20:10:33.679702053 +0100
-+++ flare_v017_1/src/WidgetListBox.cpp 2012-11-02 20:37:09.309694576 +0100
-@@ -22,7 +22,7 @@
+diff --git a/src/WidgetListBox.cpp b/src/WidgetListBox.cpp
+index 2516022..af0c6e5 100644
+--- a/src/WidgetListBox.cpp
++++ b/src/WidgetListBox.cpp
+@@ -22,7 +22,7 @@ FLARE. If not, see http://www.gnu.org/licenses/
#include "WidgetListBox.h"
#include "SharedResources.h"
@@ -994,10 +1036,11 @@ diff -uNr flare_v017_1-orig/src/WidgetListBox.cpp flare_v017_1/src/WidgetListBox
using namespace std;
-diff -uNr flare_v017_1-orig/src/WidgetScrollBar.cpp flare_v017_1/src/WidgetScrollBar.cpp
---- flare_v017_1-orig/src/WidgetScrollBar.cpp 2012-11-02 20:10:33.703701579 +0100
-+++ flare_v017_1/src/WidgetScrollBar.cpp 2012-11-02 20:37:09.327694210 +0100
-@@ -22,7 +22,7 @@
+diff --git a/src/WidgetScrollBar.cpp b/src/WidgetScrollBar.cpp
+index c1d6443..0251dbb 100644
+--- a/src/WidgetScrollBar.cpp
++++ b/src/WidgetScrollBar.cpp
+@@ -22,7 +22,7 @@ FLARE. If not, see http://www.gnu.org/licenses/
#include "WidgetScrollBar.h"
#include "SharedResources.h"
@@ -1006,10 +1049,11 @@ diff -uNr flare_v017_1-orig/src/WidgetScrollBar.cpp flare_v017_1/src/WidgetScrol
using namespace std;
-diff -uNr flare_v017_1-orig/src/WidgetScrollBox.cpp flare_v017_1/src/WidgetScrollBox.cpp
---- flare_v017_1-orig/src/WidgetScrollBox.cpp 2012-11-02 20:10:33.726701127 +0100
-+++ flare_v017_1/src/WidgetScrollBox.cpp 2012-11-02 20:37:09.385693034 +0100
-@@ -21,7 +21,7 @@
+diff --git a/src/WidgetScrollBox.cpp b/src/WidgetScrollBox.cpp
+index 8c83d37..8db40c4 100644
+--- a/src/WidgetScrollBox.cpp
++++ b/src/WidgetScrollBox.cpp
+@@ -21,7 +21,7 @@ FLARE. If not, see http://www.gnu.org/licenses/
*/
#include "WidgetScrollBox.h"
@@ -1018,10 +1062,11 @@ diff -uNr flare_v017_1-orig/src/WidgetScrollBox.cpp flare_v017_1/src/WidgetScrol
using namespace std;
-diff -uNr flare_v017_1-orig/src/WidgetSlider.cpp flare_v017_1/src/WidgetSlider.cpp
---- flare_v017_1-orig/src/WidgetSlider.cpp 2012-11-02 20:10:33.722701205 +0100
-+++ flare_v017_1/src/WidgetSlider.cpp 2012-11-02 20:37:09.374693257 +0100
-@@ -29,7 +29,7 @@
+diff --git a/src/WidgetSlider.cpp b/src/WidgetSlider.cpp
+index 07d19e2..9bdbabb 100644
+--- a/src/WidgetSlider.cpp
++++ b/src/WidgetSlider.cpp
+@@ -29,7 +29,7 @@ FLARE. If not, see http://www.gnu.org/licenses/
#include "WidgetSlider.h"
#include "SharedResources.h"
#include "UtilsDebug.h"
@@ -1030,3 +1075,6 @@ diff -uNr flare_v017_1-orig/src/WidgetSlider.cpp flare_v017_1/src/WidgetSlider.c
using namespace std;
+--
+1.8.1.4
+
diff --git a/flare.spec b/flare.spec
index fe97cad..949745c 100644
--- a/flare.spec
+++ b/flare.spec
@@ -1,13 +1,16 @@
-%global tarversion v017_1
+%global tarversion src_v018
Name: flare
-Version: 0.17.1
-Release: 9%{?dist}
+Version: 0.18
+Release: 1%{?dist}
Summary: A single player, 2D-isometric, action Role-Playing Game
License: GPLv3+
URL: http://www.flarerpg.org
-Source0: https://github.com/downloads/clintbellanger/%{name}-game/%{name}_linux_%{tarversion}.tar.gz
+Source0: http://downloads.sourceforge.net/project/%{name}-game/%{name}_%{tarversion}.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
@@ -70,8 +73,19 @@ This package contains the game data.
%patch0 -p1
%patch1 -p1
-# Fix permissions in tarball:
-find . -type f | xargs chmod 644
+cp -p %{SOURCE2} README
+
+# 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
%build
# Do not use /usr/games or /usr/share/games/
@@ -93,9 +107,6 @@ ln -s %{_datadir}/fonts/liberation/LiberationSans-Italic.ttf %{buildroot}%{_data
ln -s %{_datadir}/fonts/liberation/LiberationSans-Regular.ttf %{buildroot}%{_datadir}/%{name}/mods/default/fonts/LiberationSans-Regular.ttf
ln -s %{_datadir}/fonts/liberation/LiberationSans-Regular.ttf %{buildroot}%{_datadir}/%{name}/mods/fantasycore/fonts/LiberationSans-Regular.ttf
-# Remove script that is not needed in installation
-rm -f %{buildroot}/%{_datadir}/%{name}/mods/fantasycore/languages/xgettext.py
-
# Validate desktop file
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
@@ -112,7 +123,7 @@ fi
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
-%doc COPYING README credits.html
+%doc COPYING README
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
@@ -122,29 +133,40 @@ fi
# LOCALES:
# For updating (replace %% with single one):
# find -name "*.po"| sed 's/^.\(.*[a-z]\+\.\)\(..\)\.po/%%lang(\2) %%{_datadir}\/%%{name}\1\2.po/'
+%lang(sv) %{_datadir}/%{name}/mods/alpha_demo/languages/data.sv.po
%lang(gl) %{_datadir}/%{name}/mods/alpha_demo/languages/data.gl.po
%lang(fi) %{_datadir}/%{name}/mods/alpha_demo/languages/data.fi.po
+%lang(pl) %{_datadir}/%{name}/mods/alpha_demo/languages/data.pl.po
%lang(de) %{_datadir}/%{name}/mods/alpha_demo/languages/data.de.po
%lang(ru) %{_datadir}/%{name}/mods/alpha_demo/languages/data.ru.po
%lang(ja) %{_datadir}/%{name}/mods/alpha_demo/languages/data.ja.po
+%lang(nb) %{_datadir}/%{name}/mods/alpha_demo/languages/data.nb.po
%lang(nl) %{_datadir}/%{name}/mods/alpha_demo/languages/data.nl.po
%lang(fr) %{_datadir}/%{name}/mods/alpha_demo/languages/data.fr.po
%lang(uk) %{_datadir}/%{name}/mods/alpha_demo/languages/data.uk.po
+%lang(cs) %{_datadir}/%{name}/mods/alpha_demo/languages/data.cs.po
%lang(it) %{_datadir}/%{name}/mods/alpha_demo/languages/data.it.po
+%lang(sv) %{_datadir}/%{name}/mods/fantasycore/languages/data.sv.po
%lang(gl) %{_datadir}/%{name}/mods/fantasycore/languages/data.gl.po
%lang(fi) %{_datadir}/%{name}/mods/fantasycore/languages/data.fi.po
+%lang(pl) %{_datadir}/%{name}/mods/fantasycore/languages/data.pl.po
%lang(de) %{_datadir}/%{name}/mods/fantasycore/languages/data.de.po
%lang(ru) %{_datadir}/%{name}/mods/fantasycore/languages/data.ru.po
%lang(ja) %{_datadir}/%{name}/mods/fantasycore/languages/data.ja.po
+%lang(nb) %{_datadir}/%{name}/mods/fantasycore/languages/data.nb.po
%lang(nl) %{_datadir}/%{name}/mods/fantasycore/languages/data.nl.po
%lang(fr) %{_datadir}/%{name}/mods/fantasycore/languages/data.fr.po
%lang(uk) %{_datadir}/%{name}/mods/fantasycore/languages/data.uk.po
+%lang(cs) %{_datadir}/%{name}/mods/fantasycore/languages/data.cs.po
%lang(it) %{_datadir}/%{name}/mods/fantasycore/languages/data.it.po
%lang(sk) %{_datadir}/%{name}/mods/default/languages/engine.sk.po
%lang(be) %{_datadir}/%{name}/mods/default/languages/engine.be.po
%lang(sv) %{_datadir}/%{name}/mods/default/languages/engine.sv.po
+%lang(pl) %{_datadir}/%{name}/mods/default/languages/engine.pl.po
%lang(it) %{_datadir}/%{name}/mods/default/languages/engine.it.po
+%lang(en) %{_datadir}/%{name}/mods/default/languages/engine.en.po
%lang(el) %{_datadir}/%{name}/mods/default/languages/engine.el.po
+%lang(nb) %{_datadir}/%{name}/mods/default/languages/engine.nb.po
%lang(gl) %{_datadir}/%{name}/mods/default/languages/engine.gl.po
%lang(es) %{_datadir}/%{name}/mods/default/languages/engine.es.po
%lang(ja) %{_datadir}/%{name}/mods/default/languages/engine.ja.po
@@ -154,6 +176,7 @@ fi
%lang(fr) %{_datadir}/%{name}/mods/default/languages/engine.fr.po
%lang(de) %{_datadir}/%{name}/mods/default/languages/engine.de.po
%lang(uk) %{_datadir}/%{name}/mods/default/languages/engine.uk.po
+%lang(cs) %{_datadir}/%{name}/mods/default/languages/engine.cs.po
# only language folder starts with 'l'
%{_datadir}/%{name}/mods/*/[!l]*
@@ -166,29 +189,40 @@ fi
%dir %{_datadir}/%{name}/mods/*/languages
%changelog
+* Mon Apr 1 2013 Erik Schilling <ablu.erikschilling at googlemail.com> 0.18-1
+- New upstream release
+- Breaks compatibillity with old save files
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Tue Nov 13 2012 Erik Schilling <ablu.erikschilling at googlemail.com> 0.17.1-8
- Simplified directiory permissions
+
* Mon Nov 12 2012 Erik Schilling <ablu.erikschilling at googlemail.com> 0.17.1-7
- Fixed directory ownership
+
* Sun Nov 11 2012 Erik Schilling <ablu.erikschilling at googlemail.com> 0.17.1-6
- Spell-fix: reimplementation --> re-implementation
- Mark translation files with %%lang
+
* Fri Nov 02 2012 Erik Schilling <ablu.erikschilling at googlemail.com> 0.17.1-5
- Dropped / between path makros
- Made use of %%{name} makro in Source1
- Made sure that the binary links against system SDL_gfx parts
- Replaced unifont use with dejavu since the font was not packaged
+
* Thu Oct 25 2012 Erik Schilling <ablu.erikschilling at googlemail.com> 0.17.1-4
- Fixed require of binaries in -data package
- Fixed update icon cache
- Fixed trailing slash of url
- Fixed license from GPLv3 to GPLv3+
+
* Sat Oct 6 2012 Erik Schilling <ablu.erikschilling at googlemail.com> 0.17.1-3
- Do not install to /usr/share/games but /usr/share (https://fedoraproject.org/wiki/SIGs/Games/Packaging)
+
* Sat Oct 6 2012 Erik Schilling <ablu.erikschilling at googlemail.com> 0.17.1-2
- Added BuildArch: noarch for data package
+
* Fri Oct 5 2012 Erik Schilling <ablu.erikschilling at googlemail.com> 0.17.1-1
- Initial packaging
diff --git a/sources b/sources
index a114fe9..52c3186 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a042fdd7428471121be00bf25f425811 flare_linux_v017_1.tar.gz
+6da55df2ee735922a2785b257c3cea4f flare_src_v018.tar.gz
More information about the scm-commits
mailing list