rpms/monsterz/F-8 monsterz-0.7.1-64bitfix.patch, NONE, 1.1 monsterz.spec, 1.4, 1.5

[Ian Chapman (oddsocks)]

Author: oddsocks

Update of /cvs/pkgs/rpms/monsterz/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23540

Modified Files:
	monsterz.spec 
Added Files:
	monsterz-0.7.1-64bitfix.patch 
Log Message:


monsterz-0.7.1-64bitfix.patch:

--- NEW FILE monsterz-0.7.1-64bitfix.patch ---
--- monsterz-0.7.1/monsterz.py.orig	2007-12-17 22:05:00.000000000 +0000
+++ monsterz-0.7.1/monsterz.py	2008-02-26 14:23:34.000000000 +0000
@@ -108,7 +108,7 @@
                 M = int(max(r, g, b))
                 m = int(min(r, g, b))
                 val = (2 * M + r + g + b) / 5
-                p[:] = (val + r) / 2, (val + g) / 2, (val + b) / 2
+                #p[:] = (val + r) / 2, (val + g) / 2, (val + b) / 2
                 if alpha[y][x] >= 250:
                     alpha[y][x] = 255 - (M - m) * 3 / 4
         del pixels
@@ -129,7 +129,7 @@
                 r, g, b = p
                 M = int(max(r, g, b))
                 m = int(min(r, g, b))
-                p[:] = (m + r) / 2, (m + g) / 2, (m + b) / 2
+                #p[:] = (m + r) / 2, (m + g) / 2, (m + b) / 2
                 if alpha[y][x] >= 250:
                     alpha[y][x] = 255 - M * 2 / 3
         del pixels


Index: monsterz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monsterz/F-8/monsterz.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- monsterz.spec	6 Jan 2008 20:46:41 -0000	1.4
+++ monsterz.spec	26 Feb 2008 19:46:10 -0000	1.5
@@ -1,13 +1,14 @@
 Name:           monsterz
 Version:        0.7.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Puzzle game, similar to Bejeweled or Zookeeper
 Group:          Amusements/Games
 License:        WTFPL
 URL:            http://sam.zoy.org/monsterz/
 Source0:        http://sam.zoy.org/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.score
-Patch0:         monsterz-0.7.1-userpmopts.patch
+Patch0:         %{name}-0.7.1-userpmopts.patch
+Patch1:         %{name}-0.7.1-64bitfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
 Requires:       pygame
@@ -27,6 +28,9 @@
 %prep
 %setup -q
 %patch0 -p1
+%ifarch x86_64 ppc64
+%patch1 -p1
+%endif
 
 
 %build
@@ -98,6 +102,12 @@
 
 
 %changelog
+* Tue Feb 26 2008 Ian Chapman <packages[AT]amiga-hardware.com> 0.7.1-3
+- Fix for BZ 434688
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7.1-2
+- Autorebuild for GCC 4.3
+
 * Sun Jan 06 2008 Ian Chapman <packages[AT]amiga-hardware.com> 0.7.1-1
 - Upgrade to 0.7.1
 - Drop separate data package as it's unnecessary