rpms/snowballz/F-10 snowballz-dontcache.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 snowballz-snapshot.sh, 1.1, 1.2 snowballz.desktop, 1.1, 1.2 snowballz.spec, 1.1, 1.2 sources, 1.2, 1.3

[Orcan Ogetbil]

Author: oget

Update of /cvs/free/rpms/snowballz/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17904

Modified Files:
	.cvsignore snowballz-snapshot.sh snowballz.desktop 
	snowballz.spec sources 
Added Files:
	snowballz-dontcache.patch 
Log Message:
* Tue May 12 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0-0.7.beta1.20090512hg
- New snapshot


snowballz-dontcache.patch:

--- NEW FILE snowballz-dontcache.patch ---
--- snowballz/lib/terrain.py~	2009-05-12 14:35:02.000000000 -0400
+++ snowballz/lib/terrain.py	2009-05-12 15:31:25.000000000 -0400
@@ -85,12 +85,12 @@ class Terrain(object):
                         self.v_c[vx, vy, :3] = d, d, d
                     assert p.pop()
 
-        if not self.using_cache:
-            assert p.push("Save cache")
-            # Save cache if necessary
-            numpy.savez(os.path.join(cache_path, "cache.npz"), v=self.v,
-                    v_c=self.v_c, v_t=self.v_t)
-            assert p.pop()
+        #if not self.using_cache:
+        #    assert p.push("Save cache")
+        #    # Save cache if necessary
+        #    numpy.savez(os.path.join(cache_path, "cache.npz"), v=self.v,
+        #            v_c=self.v_c, v_t=self.v_t)
+        #    assert p.pop()
 
         #if ttype != "all":
             #assert p.push("Blending")


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/snowballz/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Feb 2009 17:16:43 -0000	1.2
+++ .cvsignore	12 May 2009 20:50:04 -0000	1.3
@@ -1 +1 @@
-snowballz-1.0-beta1.20090110hg.tar.bz2
+snowballz-1.0-alpha1.20090512hg.tar.bz2


Index: snowballz-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/snowballz/F-10/snowballz-snapshot.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- snowballz-snapshot.sh	13 Feb 2009 17:16:43 -0000	1.1
+++ snowballz-snapshot.sh	12 May 2009 20:50:04 -0000	1.2
@@ -25,11 +25,17 @@
 name=snowballz
 
 cd "$tmp"
-hg clone http://freehg.org/u/joey/snowballz/
+#hg clone http://freehg.org/u/joey/snowballz/
+hg clone http://bitbucket.org/joey101/snowballz/
 rm -fr $name/.hg*
 # Removing the shipped fonts
 # No fonts are allowed in Fedora in non-font packages
 rm $name/data/*.ttf
+cd $name
+# Get the snowui which will be a part of snowballz final release
+hg clone http://freehg.org/u/joey/snowui/ 
+rm -fr snowui/.hg*
+cd ..
 tar jcf "$pwd"/$name-$version.$hg.tar.bz2 $name
 echo "Written: $name-$version-$hg.tar.bz2"
 cd - >/dev/null


Index: snowballz.desktop
===================================================================
RCS file: /cvs/free/rpms/snowballz/F-10/snowballz.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- snowballz.desktop	13 Feb 2009 17:16:43 -0000	1.1
+++ snowballz.desktop	12 May 2009 20:50:04 -0000	1.2
@@ -1,6 +1,5 @@
 [Desktop Entry]
-Encoding=UTF-8
-Name=SnowballZ Beta1
+Name=SnowballZ Alpha1
 GenericName=Real-time Strategy Game
 Comment=A real-time strategy game where you command your army of penguins
 Exec=snowballz


Index: snowballz.spec
===================================================================
RCS file: /cvs/free/rpms/snowballz/F-10/snowballz.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- snowballz.spec	13 Feb 2009 17:16:43 -0000	1.1
+++ snowballz.spec	12 May 2009 20:50:04 -0000	1.2
@@ -1,8 +1,8 @@
-%define hgver beta1.20090110hg
+%define hgver alpha1.20090512hg
 
 Name:           snowballz
 Version:        1.0
-Release:        0.5.%{hgver}%{?dist}
+Release:        0.7.%{hgver}%{?dist}
 Summary:        A Fun Real Time Strategy Game Featuring Snowball Fights with Penguins
 Group:          Amusements/Games
 License:        MIT
@@ -19,6 +19,8 @@
 
 # The hg-fetch script
 Source99:       %{name}-snapshot.sh
+# Don't create a cache file in %%{_datadir}
+Patch0:         %{name}-dontcache.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,9 +28,9 @@
 BuildRequires:  python-setuptools-devel
 BuildRequires:  desktop-file-utils
 
-Requires:       python-iniparse
-Requires:       pygame
 Requires:       pyglet
+Requires:       python-cjson
+Requires:       python-iniparse
 Requires:       python-rabbyt
 
 
@@ -46,6 +48,7 @@
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1 -b .dontcache
 cp %{SOURCE1} setup.py
 
 # Change the hardcoded path with a macro:
@@ -53,12 +56,18 @@
 touch -r %{SOURCE5} %{name}-wrapper
 
 %build
-%{__python} setup.py build
+python setup.py build
+pushd snowui
+   python setup.py build
+popd
 
 %install
 rm -rf %{buildroot}
 
-%{__python} setup.py install --skip-build --root %{buildroot} --install-lib %{_datadir}/%{name}
+python setup.py install --skip-build --root %{buildroot} --install-lib %{_datadir}/%{name}
+pushd snowui
+   python setup.py install --skip-build --root %{buildroot} --install-lib %{_datadir}/%{name}
+popd
 
 # Kill the egg since the eggs are only needed in python
 # libraries that go to site-packages.
@@ -77,6 +86,9 @@
 
 install -p -D -m 0755 %{name}-wrapper %{buildroot}%{_bindir}/%{name}
 
+for txtfile in COPYING README CHANGELOG; do
+   mv snowui/$txtfile $txtfile.snowui
+done
 
 %clean
 rm -rf %{buildroot}
@@ -84,6 +96,7 @@
 
 %files
 %defattr(-,root,root,-)
+%doc COPYING* README* CHANGELOG*
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}.xpm
@@ -91,6 +104,12 @@
 %{_mandir}/man6/%{name}.*
 
 %changelog
+* Tue May 12 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0-0.7.beta1.20090512hg
+- New snapshot
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.0-0.6.beta1.20090110hg
+- rebuild for new F11 features
+
 * Wed Feb 04 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0-0.5.beta1.20090110hg
 - Updated description
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/snowballz/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Feb 2009 17:16:43 -0000	1.2
+++ sources	12 May 2009 20:50:04 -0000	1.3
@@ -1 +1 @@
-06614f934f2ec22e97cd694443b13b77  snowballz-1.0-beta1.20090110hg.tar.bz2
+c74bd6018ad569b1e7c82d0278e5b74e  snowballz-1.0-alpha1.20090512hg.tar.bz2