[megaglest] Update to megaglest 3.9.0.3
pcpa
pcpa at fedoraproject.org
Tue Nov 19 20:32:37 UTC 2013
commit ee47f9df2c6961c81810f10875895c03d77bcd9c
Author: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date: Tue Nov 19 18:32:39 2013 -0200
Update to megaglest 3.9.0.3
.gitignore | 1 +
megaglest-3.6.0.2-help2man.patch | 11 --
megaglest-3.6.0.3-translation-missing.patch | 14 --
megaglest-color-picking.patch | 53 -------
megaglest-help2man.patch | 12 ++
megaglest-miniupnpc-1.7.patch | 158 --------------------
megaglest-selection.patch | 80 ----------
megaglest-translation-missing.patch | 14 ++
...-3.6.0.3-xerces.patch => megaglest-xerces.patch | 0
megaglest.spec | 30 ++---
sources | 2 +-
11 files changed, 39 insertions(+), 336 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 82e30bc..f4f4764 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/megaglest-source-3.6.0.3.tar.xz
/megaglest-source-3.7.1.tar.xz
+/megaglest-source-3.9.0.3.tar.xz
diff --git a/megaglest-help2man.patch b/megaglest-help2man.patch
new file mode 100644
index 0000000..f417183
--- /dev/null
+++ b/megaglest-help2man.patch
@@ -0,0 +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)
+ 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}
+ DEPENDS ${TARGET_NAME})
+ ELSE()
+ add_custom_target(${TARGET_NAME_MANPAGE} ALL
diff --git a/megaglest-translation-missing.patch b/megaglest-translation-missing.patch
new file mode 100644
index 0000000..db10dab
--- /dev/null
+++ b/megaglest-translation-missing.patch
@@ -0,0 +1,14 @@
+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:
+
+ void pushBackItem(string item, string translated_item="");
+ void setItems(const vector<string> &items, const vector<string> translated_items=vector<string>());
+- void setSelectedItemIndex(int index, bool errorOnMissing=true);
+- void setSelectedItem(string item, bool errorOnMissing=true);
++ void setSelectedItemIndex(int index, bool errorOnMissing=false);
++ void setSelectedItem(string item, bool errorOnMissing=false);
+ void setEditable(bool editable);
+
+ bool hasItem(string item) const;
diff --git a/megaglest-3.6.0.3-xerces.patch b/megaglest-xerces.patch
similarity index 100%
rename from megaglest-3.6.0.3-xerces.patch
rename to megaglest-xerces.patch
diff --git a/megaglest.spec b/megaglest.spec
index 65aa682..5b49485 100644
--- a/megaglest.spec
+++ b/megaglest.spec
@@ -1,11 +1,13 @@
+%define patch_level .3
+
Name: megaglest
-Version: 3.7.1
-Release: 10%{?dist}
+Version: 3.9.0
+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}.tar.xz
+Source0: http://downloads.sourceforge.net/%{name}/files/%{name}-source-%{version}%{patch_level}.tar.xz
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: mesa-libGL-devel
@@ -39,20 +41,12 @@ Obsoletes: glest <= 3.2.2
# Correct use of XERCESC_INCLUDE and XERCESC_INCLUDE_DIR that
# should have the same value if xerces is found.
-Patch0: %{name}-3.6.0.3-xerces.patch
+Patch0: %{name}-xerces.patch
# Correct usage of xvfb-run when generating manpages
-Patch1: %{name}-3.6.0.2-help2man.patch
+Patch1: %{name}-help2man.patch
# Do not fail with cryptic message if there are missing translations
# just use english text
-Patch2: %{name}-3.6.0.3-translation-missing.patch
-# http://sourceforge.net/tracker/?func=detail&aid=3598159&group_id=300350&atid=1266776
-Patch3: %{name}-color-picking.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=924874
-# http://sourceforge.net/tracker/?func=detail&aid=3608835&group_id=300350&atid=1266776
-Patch4: %{name}-selection.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=996357
-# http://megaglest.svn.sourceforge.net/viewvc/megaglest?view=revision&revision=3958
-Patch5: %{name}-miniupnpc-1.7.patch
+Patch2: %{name}-translation-missing.patch
%description
MegaGlest is an open source 3D-real-time strategy game, where you control
@@ -68,11 +62,6 @@ within the game at no cost.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%if 0%{?fedora} >= 20
-%patch5 -p1
-%endif
%build
mkdir -p build
@@ -112,6 +101,9 @@ done
%{_datadir}/megaglest/*
%changelog
+* Tue Nov 19 2013 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 3.9.0-1
+- Update to latest upstream release.
+
* Mon Nov 18 2013 Dave Airlie <airlied at redhat.com> - 3.7.1-10
- rebuilt for GLEW 1.10
diff --git a/sources b/sources
index 3c9935c..9fcebb6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7a960ec73784aa0f7b951d2ad963456 megaglest-source-3.7.1.tar.xz
+0b1a921fcba10fa3fdf9035c64d8adef megaglest-source-3.9.0.3.tar.xz
More information about the scm-commits
mailing list