rpms/python-kaa-base/F-11 import.log, NONE, 1.1 kaa-base-0.6.0-backport_py26.patch, NONE, 1.1 kaa-base-0.6.0-py26.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 python-kaa-base.spec, 1.10, 1.11 sources, 1.5, 1.6

Nicolas Chauvet kwizart at fedoraproject.org
Wed Jul 1 11:44:59 UTC 2009 

Author: kwizart

Update of /cvs/pkgs/rpms/python-kaa-base/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2958/F-11

Modified Files:
	.cvsignore python-kaa-base.spec sources 
Added Files:
	import.log kaa-base-0.6.0-backport_py26.patch 
	kaa-base-0.6.0-py26.patch 
Log Message:
- Update to 0.6.0
- Remove Requires python-lirc (optional)
- Deprecate python-sqlite2 over sqlite3 bundled in python
- Backport switch to hashlib



--- NEW FILE import.log ---
python-kaa-base-0_6_0-2_fc11:F-11:python-kaa-base-0.6.0-2.fc11.src.rpm:1246448281

kaa-base-0.6.0-backport_py26.patch:

--- NEW FILE kaa-base-0.6.0-backport_py26.patch ---
diff -up kaa-base-0.6.0/src/config.py.bp26 kaa-base-0.6.0/src/config.py
--- kaa-base-0.6.0/src/config.py.bp26	2009-05-25 21:56:12.000000000 +0200
+++ kaa-base-0.6.0/src/config.py	2009-07-01 13:18:09.470559661 +0200
@@ -34,7 +34,7 @@ import re
 import copy
 import logging
 import stat
-import md5
+import hashlib
 import textwrap
 from new import classobj
 
@@ -104,7 +104,7 @@ class Base(object):
         a hash of the schema only.
         """
         value = repr(self._value) if values else ''
-        return md5.new(repr(self._name) + repr(self._desc) + repr(self._default) + value).hexdigest()
+        return hashlib.md5(repr(self._name) + repr(self._desc) + repr(self._default) + value).hexdigest()
 
 
     def copy(self):
@@ -228,7 +228,7 @@ class Var(Base):
         """
         Returns a hash of the config item.
         """
-        return md5.new(super(Var, self)._hash(values) + repr(self._type)).hexdigest()
+        return hashlib.md5(super(Var, self)._hash(values) + repr(self._type)).hexdigest()
 
 
     def _cfg_string(self, prefix, print_desc=True):
@@ -356,7 +356,7 @@ class Group(Base):
         """
         Returns a hash of the config item.
         """
-        hash = md5.new(super(Group, self)._hash(values))
+        hash = hashlib.md5(super(Group, self)._hash(values))
         for name in self._vars:
             hash.update(self._dict[name]._hash(values))
         return hash.hexdigest()
@@ -509,7 +509,7 @@ class Dict(Base):
         """
         Returns a hash of the config item.
         """
-        hash = md5.new(super(Dict, self)._hash(values))
+        hash = hashlib.md5(super(Dict, self)._hash(values))
         for key in self.keys():
             hash.update(self._dict[key]._hash(values))
         return hash.hexdigest()
@@ -680,7 +680,7 @@ class Config(Group):
         """
         Returns a hash of the config item.
         """
-        return md5.new(super(Config, self)._hash(values) + repr(self._bad_lines)).hexdigest()
+        return hashlib.md5(super(Config, self)._hash(values) + repr(self._bad_lines)).hexdigest()
 
 
     def copy(self):
diff -up kaa-base-0.6.0/src/distribution/svn2log.py.bp26 kaa-base-0.6.0/src/distribution/svn2log.py
--- kaa-base-0.6.0/src/distribution/svn2log.py.bp26	2009-05-25 20:19:31.000000000 +0200
+++ kaa-base-0.6.0/src/distribution/svn2log.py	2009-07-01 13:18:09.472561034 +0200
@@ -28,7 +28,6 @@
 # python imports
 import os
 import textwrap
-import popen2
 import re
 import xml.sax
 
@@ -146,7 +145,7 @@ def svn2log(module):
     # Create a parser
     parser = xml.sax.make_parser()
 
-    reader = popen2.popen2('svn log -v --xml')[0]
+    reader = os.popen('svn log -v --xml')
     writer = open('ChangeLog', 'w')
 
     dh = LogParser(writer, prefix, users)
diff -up kaa-base-0.6.0/src/rpc.py.bp26 kaa-base-0.6.0/src/rpc.py
--- kaa-base-0.6.0/src/rpc.py.bp26	2009-05-25 20:19:31.000000000 +0200
+++ kaa-base-0.6.0/src/rpc.py	2009-07-01 13:18:09.473560323 +0200
@@ -103,7 +103,7 @@ import cPickle
 import pickle
 import struct
 import sys
-import sha
+import hashlib
 import time
 import traceback
 
@@ -702,7 +702,7 @@ class Channel(Object):
         value is not by design a nonce, but in practice it probably is.
         """
         rbytes = file("/dev/urandom").read(64)
-        return sha.sha(str(time.time()) + rbytes).digest()
+        return hashlib.sha1(str(time.time()) + rbytes).digest()
 
 
     def _send_auth_challenge(self):
@@ -732,7 +732,7 @@ class Channel(Object):
 
         def H(s):
             # Returns the 20 byte SHA-1 digest of string s.
-            return sha.sha(s).digest()
+            return hashlib.sha1(s).digest()
 
         if not salt:
             salt = self._get_rand_value()
diff -ur kaa-base-0.6.0/src/weakref.py kaa/kaa/base/src/weakref.py
--- kaa-base-0.6.0/src/weakref.py	2009-05-25 20:19:31.000000000 +0200
+++ kaa/kaa/base/src/weakref.py	2009-07-01 13:00:45.980561089 +0200
@@ -58,7 +58,7 @@
         # callable.
         if callable(object):
             cls = _callable_weakref
-        return super(weakref, weakref).__new__(cls, object)
+        return super(weakref, weakref).__new__(cls)
 
     def __init__(self, object):
         if object is not None:

kaa-base-0.6.0-py26.patch:

--- NEW FILE kaa-base-0.6.0-py26.patch ---
diff -up kaa-base-0.6.0/src/db.py.py26 kaa-base-0.6.0/src/db.py
--- kaa-base-0.6.0/src/db.py.py26	2009-05-25 20:19:31.000000000 +0200
+++ kaa-base-0.6.0/src/db.py	2009-07-01 13:33:09.568308678 +0200
@@ -39,7 +39,7 @@ import copy_reg
 import _weakref
 import threading
 #from sets import Set
-from pysqlite2 import dbapi2 as sqlite
+from sqlite3 import dbapi2 as sqlite
 
 # kaa base imports
 from strutils import str_to_unicode


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-kaa-base/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Mar 2008 13:57:33 -0000	1.5
+++ .cvsignore	1 Jul 2009 11:44:57 -0000	1.6
@@ -1 +1 @@
-kaa-base-0.4.0.tar.gz
+kaa-base-0.6.0.tar.gz


Index: python-kaa-base.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-kaa-base/F-11/python-kaa-base.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- python-kaa-base.spec	26 Feb 2009 21:55:33 -0000	1.10
+++ python-kaa-base.spec	1 Jul 2009 11:44:58 -0000	1.11
@@ -1,43 +1,36 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-kaa-base
-Version:        0.4.0
-Release:        3%{?dist}
+Version:        0.6.0
+Release:        2%{?dist}
 Summary:        The Kaa Media - base package for python
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://www.freevo.org/kaa
 Source0:        http://downloads.sourceforge.net/freevo/kaa-base-%{version}.tar.gz
+Patch0:         kaa-base-0.6.0-py26.patch
+Patch1:         kaa-base-0.6.0-backport_py26.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
   
 BuildRequires:  python-devel
-BuildRequires:  glib2-devel >= 2.4.0
-Requires: libxml2-python
-Requires: python-lirc
-Requires: python-sqlite2 >= 2.1.0
+BuildRequires:  glib2-devel >= 2.6.0
+Requires: libxml2-python >= 2.6.0
+#Optional
+#Requires: python-lirc
 
 %description
-The Kaa Media Repository is a set of python modules related to media.
+kaa.base is an LGPL-licensed generic application framework, providing the
+foundation for other modules within Kaa, and can be used in any type of project,
+from small event-driven tools, to larger, complex applications.
 
-Kaa modules are based on parts from Freevo and modules created for MeBox. 
-Kaa exists to encourage code sharing between these projects, and to serve as 
-an umbrella for several previously disparate media-related modules in order 
-to make them available from one (unique) namespace. Kaa provides a base module 
-that implements the common features needed for application development, such as
-mainloop management, timers, signals, callbacks, file descriptor monitors, etc.
-Kaa's other modules provide specific media-related functionality, such as 
-retrieving metadata on arbitrary media files (kaa.metadata, previously 
-called mmpython), Python wrappers for Imlib2, Xine, and Evas, and many other 
-high level APIs for easily creating applications that deal with video and
-audio.
-
-Kaa is named after the python in the Jungle Book by Rudyard Kipling. 
 
 
 %prep
 %setup -q -n kaa-base-%{version}
+%patch0 -p1 -b .py26
+%patch1 -p1 -b .bp26
 
 
 %build
@@ -57,8 +50,8 @@ rm -rf $RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name "*.py" |xargs chmod 0644
 
 # Removed unneeded shebang
-for i in dispatch.py version.py nf_gtk.py nf_generic.py log.py __init__.py ;do
-sed -i -e 's|#!/usr/bin/env python|#|' $RPM_BUILD_ROOT%{python_sitearch}/kaa/notifier/pynotifier/$i
+for i in dispatch.py version.py nf_gtk.py nf_generic.py nf_twisted.py log.py __init__.py ;do
+sed -i -e 's|#!/usr/bin/env python|#|' $RPM_BUILD_ROOT%{python_sitearch}/kaa/pynotifier/${i}
 done
 
 %clean
@@ -72,6 +65,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 30 2009 kwizart < kwizart at gmail.com > - 0.6.0-2
+- Update to 0.6.0
+- Remove Requires python-lirc (optional)
+- Deprecate python-sqlite2 over sqlite3 bundled in python
+- Backport switch to hashlib
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-kaa-base/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 Mar 2008 13:57:33 -0000	1.5
+++ sources	1 Jul 2009 11:44:58 -0000	1.6
@@ -1 +1 @@
-f45ae6dbc78f762752cc423106d4e4f7  kaa-base-0.4.0.tar.gz
+5fdac0492dbbb412c2cafe32ea8c60a8  kaa-base-0.6.0.tar.gz

More information about the fedora-extras-commits mailing list