rpms/python-peak-rules/F-11 python-peak-rules-py26-deprecation.patch, NONE, 1.1 python-peak-rules-x86_64-doctest.patch, NONE, 1.1 python-peak-rules.spec, 1.8, 1.9

[Kyle VanderBeek]

Author: kylev

Update of /cvs/pkgs/rpms/python-peak-rules/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9594

Modified Files:
	python-peak-rules.spec 
Added Files:
	python-peak-rules-py26-deprecation.patch 
	python-peak-rules-x86_64-doctest.patch 
Log Message:
Backport -8 rev from devel to fix various deprecation warnings.

python-peak-rules-py26-deprecation.patch:

--- NEW FILE python-peak-rules-py26-deprecation.patch ---
--- /PEAK-Rules/peak/rules/indexing.py	2009/02/22 04:20:24	2599
+++ PEAK-Rules/peak/rules/indexing.py	2009/07/15 04:30:57	2600
@@ -217,7 +217,7 @@
     def __new__(cls, engine, expr):
         if cls is BitmapIndex:
             cls = bitmap_index_type(engine, expr)
-        return super(BitmapIndex, cls).__new__(cls, engine, expr)
+        return super(BitmapIndex, cls).__new__(cls)
 
     def __init__(self, engine, expr):
         self.extra = {}

python-peak-rules-x86_64-doctest.patch:

--- NEW FILE python-peak-rules-x86_64-doctest.patch ---
--- Indexing.txt.orig	2009-06-03 07:43:19.000000000 -0400
+++ Indexing.txt	2009-06-03 07:43:54.000000000 -0400
@@ -644,7 +644,7 @@
 long integers::
 
     >>> seven_long = to_bits([32,33,34])
-    >>> print hex(seven_long)
+    >>> print hex(long(seven_long))
     0x700000000L
 
     >>> list(from_bits(seven_long))


Index: python-peak-rules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-rules/F-11/python-peak-rules.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- python-peak-rules.spec	26 Feb 2009 22:48:36 -0000	1.8
+++ python-peak-rules.spec	15 Jul 2009 05:10:51 -0000	1.9
@@ -13,7 +13,7 @@ Version:        0.5a1.dev
 # Release:0.3.a1.dev%{devrev}%{?dist}
 # But we can't do that yet because it breaks the upgrade path.
 # When version hits 0.5.1 or 0.6 we can correct this.
-Release:        5.%{devrev}%{?dist}
+Release:        8.%{devrev}%{?dist}
 Summary:        Generic functions and business rules support systems
 
 Group:          Development/Languages
@@ -22,6 +22,8 @@ URL:            http://pypi.python.org/p
 Source0:        http://peak.telecommunity.com/snapshots/%{packagename}-%{version}-r%{devrev}.tar.gz
 Patch0:         %{name}-setup.patch
 Patch1:         %{name}-doctest.patch
+Patch2:         %{name}-x86_64-doctest.patch
+Patch3:         %{name}-py26-deprecation.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -49,6 +51,8 @@ dispatch engines and custom method combi
 %setup -q -n %{packagename}-%{version}-r%{devrev}
 %patch0 -b .setup
 %patch1 -p1 -b .test
+%patch2 -p0 -b .x86_64
+%patch3 -p1
 %{__chmod} -x %{docs}
 
 %build
@@ -59,7 +63,10 @@ rm -rf %{buildroot}
 %{__python} setup.py install --skip-build --root %{buildroot}
 
 %check
+# Disable checks on s390x for now, see bugzilla #495874 
+%ifnarch s390x
 %{__python} setup.py test
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -70,6 +77,15 @@ rm -rf %{buildroot}
 %{python_sitelib}/*
 
 %changelog
+* Tue Jul 14 2009 Kyle VanderBeek <kylev at kylev.com> - 0.5a1.dev-8.2582
+- SVN r2600 to fix python 2.6 deprecation warnings from BitmapIndex
+
+* Wed Jun 03 2009 Luke Macken <lmacken at redhat.com> 0.5a1.dev-7.2582
+- Add a patch to get the doctests to work on x86_64
+
+* Wed Apr 15 2009 Karsten Hopp <karsten at redhat.com> 0.5a1.dev-6.2582
+- Disable checks on s390x for now, see bugzilla #495874 
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5a1.dev-5.2582
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild