rpms/pyscript/F-13 pyscript_groups_as.patch, NONE, 1.1 pyscript.spec, 1.6, 1.7

[Jef Spaleta]

Author: jspaleta

Update of /cvs/pkgs/rpms/pyscript/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25310

Modified Files:
	pyscript.spec 
Added Files:
	pyscript_groups_as.patch 
Log Message:
* Tue Jun 1  2010  Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.6.1-6
- Add patch to fix syntax error associated with using protected keyword as a variable name 


pyscript_groups_as.patch:
 groups.py |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE pyscript_groups_as.patch ---
--- pyscript/groups.py	2006-02-28 09:16:58.000000000 -0900
+++ ../groups.py	2010-06-01 12:10:39.973740694 -0800
@@ -387,11 +387,11 @@
     assert a2 in ["n", "ne", "e", "se", "s", "sw", "w", "nw", "c"]
 
     # note the swap:
-    as = options.get('as', a2)
-    ae = options.get('ae', a1)
+    a_s = options.get('as', a2)
+    a_e = options.get('ae', a1)
 
-    assert as in ["n", "ne", "e", "se", "s", "sw", "w", "nw", "c"]
-    assert ae in ["n", "ne", "e", "se", "s", "sw", "w", "nw", "c"]
+    assert a_s in ["n", "ne", "e", "se", "s", "sw", "w", "nw", "c"]
+    assert a_e in ["n", "ne", "e", "se", "s", "sw", "w", "nw", "c"]
 
     # these two have to be present
     p1 = options['p1']
@@ -424,23 +424,23 @@
 
         # place items at the edges
         # ---first object----
-        ov = getattr(items[0].bbox(), as)-p1
+        ov = getattr(items[0].bbox(), a_s)-p1
 
         # how much we need to move by
         mv = -pv.U*ov*pv.U
         items[0].move(mv)
 
         space -= abs(( getattr(items[0].bbox(), a1)
-                         - getattr(items[0].bbox(), as) )*pv.U)
+                         - getattr(items[0].bbox(), a_s) )*pv.U)
 
         # ---second object---
-        ov = getattr(items[-1].bbox(), ae)-p2
+        ov = getattr(items[-1].bbox(), a_e)-p2
 
         # how much we need to move by
         mv = -pv.U*ov*pv.U
         items[-1].move(mv)
 
-        space -= abs(( getattr(items[-1].bbox(), ae)
+        space -= abs(( getattr(items[-1].bbox(), a_e)
                          - getattr(items[-1].bbox(), a2) )*pv.U)
 
         if len(items)>2:


Index: pyscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pyscript/F-13/pyscript.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- pyscript.spec	26 Jul 2009 19:58:35 -0000	1.6
+++ pyscript.spec	1 Jun 2010 20:27:39 -0000	1.7
@@ -3,13 +3,14 @@
 
 Name:      pyscript
 Version:   0.6.1
-Release:   5%{?dist}
+Release:   6%{?dist}
 Summary:   PyScript - Postscript graphics with Python
 
 Group:     Applications/Publishing
 License:   GPLv2+
 URL:       http://pyscript.sourceforge.net
 Source0:   http://dl.sourceforge.net/sourceforge/pyscript/%{name}-%{version}.tar.gz
+Patch0:    pyscript_groups_as.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python-devel
@@ -23,6 +24,7 @@ Python and the PyScript objects.
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %{__python} setup.py build
@@ -43,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 1  2010  Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.6.1-6
+- Add patch to fix syntax error associated with using protected keyword as a variable name 
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild