rpms/warzone2100/devel warzone2100-2.1_beta2-encoding.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 warzone2100.spec, 1.17, 1.18

[Karol Trzcionka (karlik)]

Author: karlik

Update of /cvs/pkgs/rpms/warzone2100/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1588/devel

Modified Files:
	.cvsignore sources warzone2100.spec 
Added Files:
	warzone2100-2.1_beta2-encoding.patch 
Log Message:
- Update to v2.1.0-beta2                                                  
- Add requires


warzone2100-2.1_beta2-encoding.patch:

--- NEW FILE warzone2100-2.1_beta2-encoding.patch ---
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);
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/warzone2100/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Dec 2007 21:38:06 -0000	1.7
+++ .cvsignore	22 Apr 2008 17:53:43 -0000	1.8
@@ -1 +1 @@
-warzone2100-2.0.10.tar.bz2
+warzone2100-2.1_beta2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/warzone2100/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Dec 2007 21:38:06 -0000	1.7
+++ sources	22 Apr 2008 17:53:43 -0000	1.8
@@ -1 +1 @@
-d27b89fde2c8017020756441bdd2a67b  warzone2100-2.0.10.tar.bz2
+566b7b9f79d5f9b6b9b7d14b410d86e4  warzone2100-2.1_beta2.tar.bz2


Index: warzone2100.spec
===================================================================
RCS file: /cvs/pkgs/rpms/warzone2100/devel/warzone2100.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- warzone2100.spec	9 Feb 2008 15:52:49 -0000	1.17
+++ warzone2100.spec	22 Apr 2008 17:53:43 -0000	1.18
@@ -1,19 +1,21 @@
 Name:           warzone2100
-Version:        2.0.10
-Release:        2%{?dist}
+Version:        2.1.0
+Release:        0.5.beta2%{?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}-%{version}.tar.bz2
+Source0:        http://download.gna.org/warzone/releases/2.0/%{name}-2.1_beta2.tar.bz2
+Patch0:         warzone2100-2.1_beta2-encoding.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    x86_64 ppc64 sparc64 alpha
 
 BuildRequires: physfs-devel SDL_net-devel openal-devel bison flex zip
 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
@@ -24,12 +26,12 @@
 ReDev project was formed to take care of its future.
 
 %prep
-%setup -q
+%setup -q -n %{name}-2.1_beta2
+%patch0 -p0
 
 %build
-./autogen.sh
 %configure --disable-mp3 --with-distributor="Fedora"
-make
+make %{_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -39,22 +41,33 @@
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications/   \
         $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 rm $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/warzone2100
 %{_datadir}/icons/warzone*
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/warzone2100
-%doc AUTHORS ChangeLog COPYING COPYING.README TODO
+%doc AUTHORS ChangeLog COPYING COPYING.README
 
 %changelog
-* Sat Feb 09 2008 Karol Trzcionka <karlikt at gmail.com> - 2.0.10-2
-- Rebuild for gcc43
+* Tue Apr 22 2008 Karol Trzcionka <karlikt at gmail.com> - 2.1.0-0.5.beta2
+- Update to v2.1.0-beta2
+- Add requires
+* Mon Mar 03 2008 Karol Trzcionka <karlikt at gmail.com> - 2.1.0-0.4.beta1
+- Fix ppc build
+* Sun Mar 02 2008 Karol Trzcionka <karlikt at gmail.com> - 2.1.0-0.3.beta1
+- add translations
+* Sun Mar 02 2008 Karol Trzcionka <karlikt at gmail.com> - 2.1.0-0.2.beta1
+- Fix BRs
+* Sun Mar 02 2008 Karol Trzcionka <karlikt at gmail.com> - 2.1.0-0.1.beta1
+- Update to v2.1.0-beta1
+- Remove ExcludeArch
 * Sun Dec 30 2007 Karol Trzcionka <karlikt at gmail.com> - 2.0.10-1
 - Update to v2.0.10
 * Mon Dec 03 2007 Karol Trzcionka <karlikt at gmail.com> - 2.0.8-2