From 34af828261923f1579e0ebbe81fc1251ff6778e6 Mon Sep 17 00:00:00 2001 From: Karol Trzcionka Date: Oct 02 2008 21:16:50 +0000 Subject: Update to v2.1.0-beta5 --- diff --git a/.cvsignore b/.cvsignore index 66b4d19..5d858a9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -warzone2100-2.1_beta2.tar.bz2 +warzone2100-2.1_beta5.tar.bz2 diff --git a/sources b/sources index cb0a5a0..5abc477 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -566b7b9f79d5f9b6b9b7d14b410d86e4 warzone2100-2.1_beta2.tar.bz2 +c71951dc28a764af604d729b0cdf4742 warzone2100-2.1_beta5.tar.bz2 diff --git a/warzone2100-2.1_beta2-encoding.patch b/warzone2100-2.1_beta2-encoding.patch deleted file mode 100644 index 2dba187..0000000 --- a/warzone2100-2.1_beta2-encoding.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: lib/framework/i18n.c -=================================================================== ---- lib/framework/i18n.c (revision 4126) -+++ lib/framework/i18n.c (revision 4127) -@@ -99,5 +99,6 @@ - #else - (void)bindtextdomain(PACKAGE, LOCALEDIR); - #endif -+ (void)bind_textdomain_codeset(PACKAGE, "UTF-8"); - (void)textdomain(PACKAGE); - } diff --git a/warzone2100.spec b/warzone2100.spec index 7c2782b..0d60763 100644 --- a/warzone2100.spec +++ b/warzone2100.spec @@ -1,13 +1,12 @@ Name: warzone2100 Version: 2.1.0 -Release: 0.5.beta2%{?dist} +Release: 0.6.beta5%{?dist} Summary: Innovative 3D real-time strategy Group: Amusements/Games License: GPLv2+ URL: http://wz2100.net/ -Source0: http://download.gna.org/warzone/releases/2.0/%{name}-2.1_beta2.tar.bz2 -Patch0: warzone2100-2.1_beta2-encoding.patch +Source0: http://download.gna.org/warzone/releases/2.0/%{name}-2.1_beta5.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: physfs-devel SDL_net-devel openal-devel bison flex zip @@ -15,7 +14,6 @@ BuildRequires: libjpeg-devel libpng-devel libogg-devel libvorbis-devel BuildRequires: quesoglc-devel popt-devel gettext BuildRequires: automake >= 1.8 BuildRequires: desktop-file-utils -Requires: dejavu-fonts Obsoletes: warzone2100-data %description @@ -26,8 +24,7 @@ game's source code was liberated on December 6th, 2004, under a GPL license ReDev project was formed to take care of its future. %prep -%setup -q -n %{name}-2.1_beta2 -%patch0 -p0 +%setup -q -n %{name}-2.1_beta5 %build %configure --disable-mp3 --with-distributor="Fedora" @@ -56,6 +53,8 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS ChangeLog COPYING COPYING.README %changelog +* Thu Oct 02 2008 Karol Trzcionka - 2.1.0-0.6.beta5 +- Update to v2.1.0-beta2 * Tue Apr 22 2008 Karol Trzcionka - 2.1.0-0.5.beta2 - Update to v2.1.0-beta2 - Add requires