pcpa pushed to megaglest (f21). "Update to megaglest 3.11.1"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Mar 24 20:44:59 UTC 2015
>From 50866a025729971dc04c1726ce989c527816873e Mon Sep 17 00:00:00 2001
From: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date: Tue, 24 Mar 2015 17:44:01 -0300
Subject: Update to megaglest 3.11.1
diff --git a/.gitignore b/.gitignore
index a72adad..af2f265 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/megaglest-source-3.7.1.tar.xz
/megaglest-source-3.9.0.3.tar.xz
/megaglest-source-3.9.1.tar.xz
+/megaglest-source-3.11.1.tar.xz
diff --git a/megaglest-help2man.patch b/megaglest-help2man.patch
index f417183..aee5cf3 100644
--- a/megaglest-help2man.patch
+++ b/megaglest-help2man.patch
@@ -1,12 +1,12 @@
-diff -up megaglest-3.9.0/source/g3d_viewer/CMakeLists.txt.orig megaglest-3.9.0/source/g3d_viewer/CMakeLists.txt
---- megaglest-3.9.0/source/g3d_viewer/CMakeLists.txt.orig 2013-11-19 17:05:24.234673345 -0200
-+++ megaglest-3.9.0/source/g3d_viewer/CMakeLists.txt 2013-11-19 17:05:41.703674014 -0200
-@@ -167,7 +167,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
+diff -up megaglest-3.11.1/source/g3d_viewer/CMakeLists.txt.orig megaglest-3.11.1/source/g3d_viewer/CMakeLists.txt
+--- megaglest-3.11.1/source/g3d_viewer/CMakeLists.txt.orig 2015-03-24 16:33:53.688382192 -0300
++++ megaglest-3.11.1/source/g3d_viewer/CMakeLists.txt 2015-03-24 16:34:36.138383818 -0300
+@@ -175,7 +175,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.")
add_custom_target(${TARGET_NAME_MANPAGE} ALL
- COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${HELP2MAN} --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE} ${HELP2MAN_OUT_PATH}${TARGET_NAME}
-+ COMMAND ${XVFB_EXEC} --auto-servernum ${HELP2MAN} --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE} ${HELP2MAN_OUT_PATH}${TARGET_NAME}
++ COMMAND ${XVFB_EXEC} --auto-servernum ${HELP2MAN} --name='${MG_MANPAGE_DESCRIPTION}' --section=6 -N -o ${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE} ${HELP2MAN_OUT_PATH}${TARGET_NAME}
DEPENDS ${TARGET_NAME})
ELSE()
add_custom_target(${TARGET_NAME_MANPAGE} ALL
diff --git a/megaglest-lua.patch b/megaglest-lua.patch
new file mode 100644
index 0000000..3ee1f6a
--- /dev/null
+++ b/megaglest-lua.patch
@@ -0,0 +1,11 @@
+diff -up megaglest-3.11.1/source/shared_lib/include/lua/lua_script.h.orig megaglest-3.11.1/source/shared_lib/include/lua/lua_script.h
+--- megaglest-3.11.1/source/shared_lib/include/lua/lua_script.h.orig 2015-03-24 17:08:33.401461832 -0300
++++ megaglest-3.11.1/source/shared_lib/include/lua/lua_script.h 2015-03-24 17:09:29.180463968 -0300
+@@ -14,6 +14,7 @@
+
+ #include <string>
++#define LUA_COMPAT_APIINTCASTS
+ #include <lua.hpp>
+ #include "vec.h"
+ #include "xml_parser.h"
+ #include "leak_dumper.h"
diff --git a/megaglest-translation-missing.patch b/megaglest-translation-missing.patch
index db10dab..abbff90 100644
--- a/megaglest-translation-missing.patch
+++ b/megaglest-translation-missing.patch
@@ -1,7 +1,7 @@
-diff -up megaglest-3.9.0/source/glest_game/facilities/components.h.orig megaglest-3.9.0/source/glest_game/facilities/components.h
---- megaglest-3.9.0/source/glest_game/facilities/components.h.orig 2013-11-19 17:06:52.616676729 -0200
-+++ megaglest-3.9.0/source/glest_game/facilities/components.h 2013-11-19 17:06:59.295676985 -0200
-@@ -262,8 +262,8 @@ public:
+diff -up megaglest-3.11.1/source/glest_game/facilities/components.h.orig megaglest-3.11.1/source/glest_game/facilities/components.h
+--- megaglest-3.11.1/source/glest_game/facilities/components.h.orig 2015-03-24 16:50:45.806420950 -0300
++++ megaglest-3.11.1/source/glest_game/facilities/components.h 2015-03-24 16:50:55.802421333 -0300
+@@ -271,8 +271,8 @@ public:
void pushBackItem(string item, string translated_item="");
void setItems(const vector<string> &items, const vector<string> translated_items=vector<string>());
diff --git a/megaglest-underlink.patch b/megaglest-underlink.patch
new file mode 100644
index 0000000..7ce25f8
--- /dev/null
+++ b/megaglest-underlink.patch
@@ -0,0 +1,12 @@
+diff -up megaglest-3.11.1/source/shared_lib/CMakeLists.txt.orig megaglest-3.11.1/source/shared_lib/CMakeLists.txt
+--- megaglest-3.11.1/source/shared_lib/CMakeLists.txt.orig 2015-03-24 17:23:06.258495257 -0300
++++ megaglest-3.11.1/source/shared_lib/CMakeLists.txt 2015-03-24 17:27:34.428505526 -0300
+@@ -92,7 +92,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD
+ FIND_PACKAGE(OpenGL REQUIRED)
+ INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
+ IF(UNIX)
+- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})
++ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY} -lX11)
+ ENDIF()
+
+
diff --git a/megaglest-xerces.patch b/megaglest-xerces.patch
index 2a11c59..a0ac094 100644
--- a/megaglest-xerces.patch
+++ b/megaglest-xerces.patch
@@ -1,6 +1,6 @@
-diff -up megaglest-3.6.0.3/mk/cmake/Modules/FindXercesC.cmake.orig megaglest-3.6.0.3/mk/cmake/Modules/FindXercesC.cmake
---- megaglest-3.6.0.3/mk/cmake/Modules/FindXercesC.cmake.orig 2012-04-28 17:25:05.688259468 -0300
-+++ megaglest-3.6.0.3/mk/cmake/Modules/FindXercesC.cmake 2012-04-28 17:25:18.598259855 -0300
+diff -up megaglest-3.11.1/mk/cmake/Modules/FindXercesC.cmake.orig megaglest-3.11.1/mk/cmake/Modules/FindXercesC.cmake
+--- megaglest-3.11.1/mk/cmake/Modules/FindXercesC.cmake.orig 2015-03-24 16:32:35.201379187 -0300
++++ megaglest-3.11.1/mk/cmake/Modules/FindXercesC.cmake 2015-03-24 16:33:01.690380201 -0300
@@ -70,6 +70,7 @@ IF (NOT XERCESC_INCLUDE)
/usr/local/include
/usr/include
diff --git a/megaglest.spec b/megaglest.spec
index b8a83da..c2758e8 100644
--- a/megaglest.spec
+++ b/megaglest.spec
@@ -1,6 +1,6 @@
Name: megaglest
-Version: 3.9.1
-Release: 4%{?dist}
+Version: 3.11.1
+Release: 1%{?dist}
Summary: Open Source 3d real time strategy game
License: GPLv3+ and GPL+
Group: Amusements/Games
@@ -45,16 +45,20 @@ 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
+# Build with lua5.2
+Patch3: %{name}-lua.patch
+# Add extra libraries to link command line to satisfy unresolved symbols
+Patch4: %{name}-underlink.patch
%description
-MegaGlest is an open source 3D-real-time strategy game, where you control
-the armies of one of seven different factions: Tech, Magic, Egyptians,
-Indians, Norsemen, Persian or Romans. The game is setup in one of 16
-naturally looking settings, which -like the unit models- are crafted with
-great appreciation for detail. Additional game data can be downloaded from
-within the game at no cost.
+MegaGlest is an entertaining free (freeware and free software) and
+open source cross-platform 3D real-time strategy (RTS) game, where
+you control the armies of one of seven different factions: Tech,
+Magic, Egypt, Indians, Norsemen, Persian or Romans. The game is
+setup in one of 17 naturally looking settings, which -like the
+unit models- are crafted with great appreciation for detail.
+A lot of additional game data can be downloaded from within the
+game at no cost.
%prep
%setup -q
@@ -63,6 +67,7 @@ within the game at no cost.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
mkdir -p build
@@ -84,8 +89,6 @@ for image in `ls $RPM_BUILD_ROOT%{_datadir}/icons`; do
[ -e $RPM_BUILD_ROOT%{_datadir}/$image ] ||
ln -sf %{_datadir}/icons/$image $RPM_BUILD_ROOT%{_datadir}/megaglest
done
-# installed by megaglest-data
-rm $RPM_BUILD_ROOT%{_datadir}/megaglest/megaglest.bmp
for file in megaglest megaglest_editor megaglest_g3dviewer; do
desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/$file.desktop
done
@@ -103,6 +106,14 @@ done
%{_datadir}/megaglest/*
%changelog
+* Tue Mar 24 2015 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 3.11.1-1
+- Update to latest upstream release.
+- Remove upstreamed icon-path patch.
+- Update to become megaglest.bmp file owner.
+- Update description from upstream webpage.
+- Add patch to build with lua 5.2 fedora package.
+- Add underlink patch to correct missing symbols during link.
+
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.9.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 8e02d23..73589cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6f6e210cb663d5c50efc48c40faa70f megaglest-source-3.9.1.tar.xz
+d7570bc1fd329a6c15e36df81c8eab28 megaglest-source-3.11.1.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/megaglest.git/commit/?h=f21&id=50866a025729971dc04c1726ce989c527816873e
--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390
More information about the scm-commits
mailing list