[megaglest/f19: 6/6] Update to latest upstream release.

[pcpa]

commit 0b829981415a7496f3223bb8c5de88ce87c2b853
Author: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date:   Thu Jan 23 21:57:05 2014 -0200

    Update to latest upstream release.

 .gitignore                |    1 +
 megaglest-icon-path.patch |   15 +++++++++++++++
 megaglest.spec            |   23 ++++++++++++++---------
 sources                   |    2 +-
 4 files changed, 31 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f4f4764..a72adad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /megaglest-source-3.6.0.3.tar.xz
 /megaglest-source-3.7.1.tar.xz
 /megaglest-source-3.9.0.3.tar.xz
+/megaglest-source-3.9.1.tar.xz
diff --git a/megaglest-icon-path.patch b/megaglest-icon-path.patch
new file mode 100644
index 0000000..e2c63f0
--- /dev/null
+++ b/megaglest-icon-path.patch
@@ -0,0 +1,15 @@
+diff -up megaglest-3.9.1/source/glest_game/CMakeLists.txt.orig megaglest-3.9.1/source/glest_game/CMakeLists.txt
+--- megaglest-3.9.1/source/glest_game/CMakeLists.txt.orig	2014-01-23 21:39:19.627721050 -0200
++++ megaglest-3.9.1/source/glest_game/CMakeLists.txt	2014-01-23 21:39:46.431722076 -0200
+@@ -310,9 +310,9 @@ IF(BUILD_MEGAGLEST)
+ 		          "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.png"
+ 		          "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.xpm"
+ 		          "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.bmp"
+-		          "${PROJECT_SOURCE_DIR}/data/glest_game/editor.ico"
++		          "${PROJECT_SOURCE_DIR}/editor.ico"
+ 		          "${PROJECT_SOURCE_DIR}/mk/linux/glest.ico"
+-		          "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
++		          "${PROJECT_SOURCE_DIR}/g3dviewer.ico"
+ 		          DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
+ 	        ELSE()
+ 
diff --git a/megaglest.spec b/megaglest.spec
index 5b49485..8badfc1 100644
--- a/megaglest.spec
+++ b/megaglest.spec
@@ -1,13 +1,11 @@
-%define patch_level		.3
-
 Name:		megaglest
-Version:	3.9.0
+Version:	3.9.1
 Release:	1%{?dist}
 Summary:	Open Source 3d real time strategy game
 License:	GPLv3+ and GPL+
 Group:		Amusements/Games
 Url:		http://megaglest.org/
-Source0:	http://downloads.sourceforge.net/%{name}/files/%{name}-source-%{version}%{patch_level}.tar.xz
+Source0:        https://github.com/MegaGlest/%{name}-source/releases/download/%{version}/%{name}-source-%{version}.tar.xz
 BuildRequires:	cmake
 BuildRequires:	desktop-file-utils
 BuildRequires:	mesa-libGL-devel
@@ -47,6 +45,8 @@ Patch1:		%{name}-help2man.patch
 # Do not fail with cryptic message if there are missing translations
 # just use english text
 Patch2:		%{name}-translation-missing.patch
+# Use proper path to g3dviewer.ico in sources
+Patch3:         %{name}-icon-path.patch
 
 %description
 MegaGlest is an open source 3D-real-time strategy game, where you control
@@ -62,6 +62,7 @@ within the game at no cost.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 mkdir -p build
@@ -71,6 +72,7 @@ pushd build
     %cmake								\
 	-DMEGAGLEST_BIN_INSTALL_PATH=%{_bindir}				\
 	-DMEGAGLEST_ICON_INSTALL_PATH=%{_datadir}/icons			\
+	-DWANT_GIT_STAMP=OFF						\
 	..
     make %{?_smp_mflags}
 popd
@@ -89,11 +91,11 @@ for file in megaglest megaglest_editor megaglest_g3dviewer; do
 done
 
 %files
-%doc AUTHORS.source_code.txt
-%doc CHANGELOG.txt
-%doc COPYRIGHT.source_code.txt
-%doc gnu_gpl_3.0.txt
-%doc README.txt
+%doc docs/AUTHORS.source_code.txt
+%doc docs/CHANGELOG.txt
+%doc docs/COPYRIGHT.source_code.txt
+%doc docs/gnu_gpl_3.0.txt
+%doc docs/README.txt
 %{_bindir}/*
 %{_datadir}/applications/megaglest*.desktop
 %{_datadir}/icons/*
@@ -101,6 +103,9 @@ done
 %{_datadir}/megaglest/*
 
 %changelog
+* Thu Jan 23 2014 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 3.9.1-1
+- Update to latest upstream release.
+
 * Tue Nov 19 2013 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 3.9.0-1
 - Update to latest upstream release.
 
diff --git a/sources b/sources
index 9fcebb6..8e02d23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0b1a921fcba10fa3fdf9035c64d8adef  megaglest-source-3.9.0.3.tar.xz
+e6f6e210cb663d5c50efc48c40faa70f  megaglest-source-3.9.1.tar.xz