[megaglest] Update to megaglest 3.7.1.
pcpa
pcpa at fedoraproject.org
Fri Nov 23 21:49:31 UTC 2012
commit ecc72052eccc5abd01738fa6656c6a33c4a472f6
Author: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date: Fri Nov 23 17:39:30 2012 -0200
Update to megaglest 3.7.1.
.gitignore | 1 +
megaglest-3.6.0.3-gcc47.patch | 47 -----------------------------------------
megaglest.spec | 21 +++++++++++-------
sources | 2 +-
4 files changed, 15 insertions(+), 56 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1250a0d..82e30bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/megaglest-source-3.6.0.3.tar.xz
+/megaglest-source-3.7.1.tar.xz
diff --git a/megaglest.spec b/megaglest.spec
index a1932d9..32e822b 100644
--- a/megaglest.spec
+++ b/megaglest.spec
@@ -1,6 +1,6 @@
Name: megaglest
-Version: 3.6.0.3
-Release: 5%{?dist}
+Version: 3.7.1
+Release: 1%{?dist}
Summary: Open Source 3d real time strategy game
License: GPLv3+ and GPL+
Group: Amusements/Games
@@ -33,7 +33,7 @@ BuildRequires: wxGTK-devel
BuildRequires: xorg-x11-server-Xvfb
BuildRequires: zlib-devel
Requires: glx-utils
-Requires: megaglest-data
+Requires: megaglest-data = %{version}
Requires: p7zip
Obsoletes: glest <= 3.2.2
ExclusiveArch: %{ix86} x86_64
@@ -46,8 +46,6 @@ Patch1: %{name}-3.6.0.2-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
-# Required to build with gcc 4.7
-Patch3: %{name}-3.6.0.3-gcc47.patch
%description
MegaGlest is an open source 3D-real-time strategy game, where you control
@@ -59,10 +57,10 @@ within the game at no cost.
%prep
%setup -q
+
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%build
mkdir -p build
@@ -85,7 +83,9 @@ for image in `ls $RPM_BUILD_ROOT%{_datadir}/icons`; do
done
# installed by megaglest-data
rm $RPM_BUILD_ROOT%{_datadir}/megaglest/megaglest.bmp
-desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/megaglest.desktop
+for file in megaglest megaglest_editor megaglest_g3dviewer; do
+ desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/$file.desktop
+done
%files
%doc AUTHORS.source_code.txt
@@ -94,12 +94,17 @@ desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/megaglest.deskto
%doc gnu_gpl_3.0.txt
%doc README.txt
%{_bindir}/*
-%{_datadir}/applications/megaglest.desktop
+%{_datadir}/applications/megaglest*.desktop
%{_datadir}/icons/*
%{_mandir}/man6/*.6*
%{_datadir}/megaglest/*
%changelog
+* Fri Nov 23 2012 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 3.7.1-1
+- Update to latest upstream release.
+- Remove no longer required gcc 4.7 patch.
+- Add versioned requires to megaglest-data.
+
* Thu Jul 19 2012 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 3.6.0.3-5
- Do not use %%{_iconsdir} macro (#817315).
- Correct libjpeg-turbo-devel build requires (#817315).
diff --git a/sources b/sources
index f2dabbb..3c9935c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a4a2429435031d9f9cc5d9535a9de9d megaglest-source-3.6.0.3.tar.xz
+e7a960ec73784aa0f7b951d2ad963456 megaglest-source-3.7.1.tar.xz
More information about the scm-commits
mailing list