rpms/vegastrike-data/devel vegastrike-data-0.4.3-text-encoding.patch, NONE, 1.1 vegastrike-data.spec, 1.4, 1.5

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/vegastrike-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8765

Modified Files:
	vegastrike-data.spec 
Added Files:
	vegastrike-data-0.4.3-text-encoding.patch 
Log Message:
* Wed Feb 27 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.3-5
- Fix text encoding issues in 2 python files causing vegastrike to fail
  with python 2.5 (bz 435157)


vegastrike-data-0.4.3-text-encoding.patch:

--- NEW FILE vegastrike-data-0.4.3-text-encoding.patch ---
diff -up vegastrike-data-0.4.3/bases/bartender.py~ vegastrike-data-0.4.3/bases/bartender.py
--- vegastrike-data-0.4.3/bases/bartender.py~	2008-02-27 22:12:27.000000000 +0100
+++ vegastrike-data-0.4.3/bases/bartender.py	2008-02-27 22:12:27.000000000 +0100
@@ -1,3 +1,4 @@
+# coding: utf-8
 import Base
 import VS
 import vsrandom
diff -up vegastrike-data-0.4.3/modules/dynamic_news_content.py~ vegastrike-data-0.4.3/modules/dynamic_news_content.py
--- vegastrike-data-0.4.3/modules/dynamic_news_content.py~	2008-02-27 22:12:26.000000000 +0100
+++ vegastrike-data-0.4.3/modules/dynamic_news_content.py	2008-02-27 22:12:26.000000000 +0100
@@ -1,3 +1,4 @@
+# coding: utf-8
 all_faction_name_global = {
 
 #nicks -> singular


Index: vegastrike-data.spec
===================================================================
RCS file: /cvs/extras/rpms/vegastrike-data/devel/vegastrike-data.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vegastrike-data.spec	15 Aug 2007 13:41:57 -0000	1.4
+++ vegastrike-data.spec	27 Feb 2008 21:22:25 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           vegastrike-data
 Version:        0.4.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Data files for Vega Strike
 Group:          Amusements/Games
 License:        GPLv2+
@@ -19,6 +19,7 @@
 # tar cvfj vegastrike-data-0.4.3.tar.bz2 vegastrike-data-0.4.3
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        http://downloads.sourceforge.net/vegastrike/generic_cargo_datapatch.zip
+Patch0:         vegastrike-data-0.4.3-text-encoding.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       vegastrike >= %{version}
@@ -30,6 +31,9 @@
 
 %prep
 %setup -q -a 1
+%patch0 -p1
+iconv -f WINDOWS-1250 -t utf-8 bases/bartender.py > bases/bartender.py.tmp
+mv bases/bartender.py.tmp bases/bartender.py
 # some cleanup
 rm -r modules/.#total_war.c.1.8 cockpits/bomber-cockpit.cpt/#cockpit.xmesh# \
   modules/.cvsignore modules/.#faction_ships.py.1.13 modules/builtin
@@ -65,6 +69,10 @@
 
 
 %changelog
+* Wed Feb 27 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.3-5
+- Fix text encoding issues in 2 python files causing vegastrike to fail
+  with python 2.5 (bz 435157)
+
 * Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4.3-4
 - Update License tag for new Licensing Guidelines compliance