packages: lightyears/lightyears-config_path.patch, lightyears/lightyears.sp...

[lisu]

Author: lisu                         Date: Wed Sep 28 11:14:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.4

---- Files affected:
packages/lightyears:
   lightyears-config_path.patch (1.1 -> 1.2) , lightyears.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/lightyears/lightyears-config_path.patch
diff -u packages/lightyears/lightyears-config_path.patch:1.1 packages/lightyears/lightyears-config_path.patch:1.2
--- packages/lightyears/lightyears-config_path.patch:1.1	Mon Nov 24 10:14:41 2008
+++ packages/lightyears/lightyears-config_path.patch	Wed Sep 28 13:13:57 2011
@@ -1,38 +1,15 @@
---- LightYears.orig/code/config.py	2006-09-23 19:09:59.000000000 +0200
-+++ LightYears/code/config.py	2006-09-23 19:10:17.000000000 +0200
-@@ -17,10 +17,12 @@
+--- lightyears-1.4/code/config.py~	2011-09-28 13:04:54.113542424 +0200
++++ lightyears-1.4/code/config.py	2011-09-28 13:07:44.236836622 +0200
+@@ -20,10 +20,11 @@
  
  cfg = Config()
  
 +DIR = "~/.LightYears"
  FILENAME = None
  
- def Initialise():
+ def Initialise(delete_file):
 -    global cfg, FILENAME
 +    global cfg, DIR, FILENAME
-+
  
      home = extra.Get_Home()
      if ( home == None ):
-@@ -29,7 +31,8 @@
-         FILENAME = os.path.join(home, ".20k.cfg")
- 
-     try:
--        f = file(FILENAME, "rb")
-+	dir = os.path.expanduser(DIR)
-+	f = file(os.path.join(dir, FILENAME), "rb")
-         cfg2 = pickle.load(f)
-         f.close()
-         if ( cfg2.version == startup.Get_Game_Version() ):
-@@ -42,7 +45,10 @@
-     global cfg, FILENAME
- 
-     try:
--        f = file(FILENAME, "wb")
-+        dir = os.path.expanduser(DIR)
-+        if not os.path.exists(dir):
-+            os.makedirs(dir)
-+        f = file(os.path.join(dir, FILENAME), "wb")
-         pickle.dump(cfg, f)
-         f.close()
-     except Exception, x:

================================================================
Index: packages/lightyears/lightyears.spec
diff -u packages/lightyears/lightyears.spec:1.10 packages/lightyears/lightyears.spec:1.11
--- packages/lightyears/lightyears.spec:1.10	Fri Nov 28 15:44:38 2008
+++ packages/lightyears/lightyears.spec	Wed Sep 28 13:13:57 2011
@@ -2,12 +2,12 @@
 Summary:	20,000 Light Years Into Space - a real-time strategy game
 Summary(pl.UTF-8):	20,000 Light Years Into Space - strategia czasu rzeczywistego
 Name:		lightyears
-Version:	1.3a
+Version:	1.4
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Games
-Source0:	http://www.jwhitham.org.uk/20kly/%{name}-%{version}.tar.gz
-# Source0-md5:	4f6fad3980f85e20937a58e30ded851e
+Source0:	http://www.jwhitham.org/20kly/%{name}-%{version}.tar.bz2
+# Source0-md5:	1211f6c9f368e3d8053965b3e42dcdcd
 Source1:	%{name}.desktop
 Patch0:		%{name}-config_path.patch
 URL:		http://www.jwhitham.org.uk/biscuit_games/LightYears/
@@ -15,8 +15,8 @@
 BuildRequires:	rpm-pythonprov
 BuildRequires:	unzip
 Requires:	python-pygame >= 1.7
-BuildArch:	noarch
 Obsoletes:	LightYears
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -30,7 +30,7 @@
 
 %description -l pl.UTF-8
 "20,000 Light Years Into Space" to przeznaczona dla jednego gracza
-strategia czasu rzeczywistego, z motywem science-fiction "Steampunk".
+strategia czasu rzeczywistego z motywem science-fiction "Steampunk".
 
 Podczas gry gracze muszą skupić się na tworzeniu sieci dostarczającej
 parę będąc atakowanym przez różne niebezpieczeństwa. Po przejściu
@@ -53,9 +53,9 @@
 cd %{_datadir}/%{name} && python %{name}
 EOF
 
-cp lightyears $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp code/*.py $RPM_BUILD_ROOT%{_datadir}/%{name}/code
-cp -r data/* $RPM_BUILD_ROOT%{_datadir}/%{name}/data
+cp -a lightyears $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -a code/*.py $RPM_BUILD_ROOT%{_datadir}/%{name}/code
+cp -a data/* $RPM_BUILD_ROOT%{_datadir}/%{name}/data
 
 %py_comp $RPM_BUILD_ROOT%{_datadir}/%{name}
 %py_ocomp $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -71,7 +71,7 @@
 %files
 %defattr(644,root,root,755)
 %doc README.txt manual/*.html
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_desktopdir}/%{name}.desktop
 %{_pixmapsdir}/%{name}.png
@@ -82,6 +82,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2011/09/28 11:13:57  lisu
+- updated to 1.4
+
 Revision 1.10  2008/11/28 14:44:38  lisu
 - Obsoletes for LightYears
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lightyears/lightyears-config_path.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lightyears/lightyears.spec?r1=1.10&r2=1.11&f=u