Author: oget Update of /cvs/free/rpms/snowballz/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv3748 Modified Files: snowballz-snapshot.sh snowballz.spec Added Files: snowballz-fonts.patch Log Message: * Wed Nov 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0-0.9.alpha1.20091118hg - Update to latest snapshot (upstream dropped from beta to alpha) snowballz-fonts.patch: --- NEW FILE snowballz-fonts.patch --- diff -rupN snowballz.old/lib/building.py snowballz/lib/building.py --- snowballz.old/lib/building.py 2009-11-18 04:59:48.000000000 -0500 +++ snowballz/lib/building.py 2009-11-18 05:14:14.000000000 -0500 @@ -126,7 +126,7 @@ class Igloo(DynamicObjectStore): center_x = (self.sprite.left+self.sprite.right)/2 # FIXME? under certain circumstances using TSCu_Comic will cause a # segfault. - self.label = Label(string,# font_name="TSCu_Comic", + self.label = Label(string, font_name="SerafettinCartoon", x=center_x, y=self.sprite.top, anchor_x="center", color=(0,0,0,255)) else: diff -rupN snowballz.old/lib/penguin_control.py snowballz/lib/penguin_control.py --- snowballz.old/lib/penguin_control.py 2009-11-18 04:59:48.000000000 -0500 +++ snowballz/lib/penguin_control.py 2009-11-18 05:13:36.000000000 -0500 @@ -85,7 +85,7 @@ class PenguinControl: x = self.unit_selection_sprite.right - 20, y = self.unit_selection_sprite.top - 25, font_size = 17, - font_name = "TSCu_Comic", + font_name = "SerafettinCartoon", color = (100,0,0,255))) if self.num_workers: @@ -93,7 +93,7 @@ class PenguinControl: x = self.unit_selection_sprite.right - 20, y = self.unit_selection_sprite.top - 90, font_size = 17, - font_name = "TSCu_Comic", + font_name = "SerafettinCartoon", color = (100,0,0,255))) for i, u_type in enumerate(["snowballer", "worker"]): diff -rupN snowballz.old/map_editor.py snowballz/map_editor.py --- snowballz.old/map_editor.py 2009-11-18 04:59:48.000000000 -0500 +++ snowballz/map_editor.py 2009-11-18 05:15:25.000000000 -0500 @@ -76,7 +76,7 @@ class ScriptArea(object): self.sprite.xy = self.scene.map.to_pixel(map_xy) - self.font = font.load(os.path.join('data', 'TSCu_Comic.ttf'), 13) + self.font = font.load(os.path.join('data', 'SerafettinCartoon.ttf'), 13) self.text = font.Text(self.font, str(self.id)) self.text.x = self.sprite.x self.text.y = self.sprite.y Index: snowballz-snapshot.sh =================================================================== RCS file: /cvs/free/rpms/snowballz/F-12/snowballz-snapshot.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- snowballz-snapshot.sh 12 May 2009 20:44:42 -0000 1.2 +++ snowballz-snapshot.sh 22 Nov 2009 21:06:12 -0000 1.3 @@ -31,11 +31,7 @@ # 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" +echo "Written: $name-$version.$hg.tar.bz2" cd - >/dev/null Index: snowballz.spec =================================================================== RCS file: /cvs/free/rpms/snowballz/F-12/snowballz.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- snowballz.spec 5 Jun 2009 20:48:38 -0000 1.4 +++ snowballz.spec 22 Nov 2009 21:06:12 -0000 1.5 @@ -1,8 +1,8 @@ -%define hgver alpha1.20090512hg +%global hgver alpha1.20091118hg Name: snowballz Version: 1.0 -Release: 0.8.%{hgver}%{?dist} +Release: 0.9.%{hgver}%{?dist} Summary: A Fun Real Time Strategy Game Featuring Snowball Fights with Penguins Group: Amusements/Games License: MIT @@ -16,7 +16,6 @@ Source4: %{name}.6 # The wrapper script Source5: %{name} - # The hg-fetch script Source99: %{name}-snapshot.sh # Don't create a cache file in %%{_datadir} @@ -24,6 +23,8 @@ # Use simplejson instead of cjson which is not available in F-12+ # Patch sent upstream via email Patch1: %{name}-json.patch +# Use our serafettin cartoon fonts instead of the bundled one +Patch2: %{name}-fonts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -31,6 +32,7 @@ BuildRequires: python-setuptools-devel BuildRequires: desktop-file-utils +Requires: font(serafettincartoon) Requires: pyglet %if 0%{?fedora} < 11 Requires: python-simplejson @@ -39,7 +41,6 @@ Requires: python-iniparse Requires: python-rabbyt - %description Take command of your army of penguins as you blaze your path to victory! March through snow laden forests to conqueror new frontears and grow your small army. @@ -56,6 +57,8 @@ %setup -q -n %{name} %patch0 -p1 -b .dontcache %patch1 -p1 -b .json +%patch2 -p1 -b .fonts + cp %{SOURCE1} setup.py # Change the hardcoded path with a macro: @@ -64,17 +67,11 @@ %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} -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. @@ -93,9 +90,8 @@ install -p -D -m 0755 %{name}-wrapper %{buildroot}%{_bindir}/%{name} -for txtfile in COPYING README CHANGELOG; do - mv snowui/$txtfile $txtfile.snowui -done +# Create symlink for font +ln -s ../../fonts/serafettin-cartoon/SerafettinCartoon.ttf %{buildroot}%{_datadir}/%{name}/data/ %clean rm -rf %{buildroot} @@ -103,7 +99,7 @@ %files %defattr(-,root,root,-) -%doc COPYING* README* CHANGELOG* +%doc README %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/pixmaps/%{name}.xpm @@ -111,6 +107,9 @@ %{_mandir}/man6/%{name}.* %changelog +* Wed Nov 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0-0.9.alpha1.20091118hg +- Update to latest snapshot (upstream dropped from beta to alpha) + * Mon Jun 01 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0-0.8.beta1.20090512hg - Use simplejson (natively available in python2.6+) instead of cjson - Add missing Requires: python-imaging