[kobo/f13/master] Bump to new upstream version - 0.3.0.

[dmach]

commit 887e4230dd4c8158038f49b0d28d2657ab7d7c3e
Author: Daniel Mach <dmach at redhat.com>
Date:   Fri Aug 13 10:32:03 2010 +0200

    Bump to new upstream version - 0.3.0.

 .gitignore                                         |    1 +
 ...-argument-do-daemonized-worker-s-main_loo.patch |   22 +++++++++++++++++
 ...rpmlib.get_digest_algo_from_header-when-R.patch |   25 ++++++++++++++++++++
 kobo.spec                                          |   16 +++++++++---
 sources                                            |    2 +-
 5 files changed, 61 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8175a8a..6615584 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 kobo-0.2.1.tar.bz2
+kobo-0.3.0.tar.bz2
diff --git a/0001-Pass-conf-argument-do-daemonized-worker-s-main_loo.patch b/0001-Pass-conf-argument-do-daemonized-worker-s-main_loo.patch
new file mode 100644
index 0000000..f5922f4
--- /dev/null
+++ b/0001-Pass-conf-argument-do-daemonized-worker-s-main_loo.patch
@@ -0,0 +1,22 @@
+From 4cd1d69055063d327b3bf44c296497567ccc2b4c Mon Sep 17 00:00:00 2001
+From: Daniel Mach <dmach at redhat.com>
+Date: Fri, 13 Aug 2010 10:07:16 +0200
+Subject: [PATCH] Pass 'conf' argument do daemonized worker's main_loop.
+
+---
+ kobo/worker/main.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/kobo/worker/main.py b/kobo/worker/main.py
+index fc730e3..b717ea7 100644
+--- a/kobo/worker/main.py
++++ b/kobo/worker/main.py
+@@ -114,4 +114,4 @@ def main(conf, argv=None):
+     if opts.foreground:
+         main_loop(conf, foreground=True)
+     else:
+-        kobo.process.daemonize(main_loop, daemon_pid_file=pid_file, foreground=False)
++        kobo.process.daemonize(main_loop, conf=conf, daemon_pid_file=pid_file, foreground=False)
+-- 
+1.5.5.6
+
diff --git a/0002-Fix-kobo.rpmlib.get_digest_algo_from_header-when-R.patch b/0002-Fix-kobo.rpmlib.get_digest_algo_from_header-when-R.patch
new file mode 100644
index 0000000..6aa3ee8
--- /dev/null
+++ b/0002-Fix-kobo.rpmlib.get_digest_algo_from_header-when-R.patch
@@ -0,0 +1,25 @@
+From 91d4ad7391a726df61ff083d098f85c1d433d230 Mon Sep 17 00:00:00 2001
+From: Daniel Mach <dmach at redhat.com>
+Date: Fri, 13 Aug 2010 10:11:11 +0200
+Subject: [PATCH] Fix kobo.rpmlib.get_digest_algo_from_header() when RPMTAG_FILEDIGESTALGO contains None value.
+
+---
+ kobo/rpmlib.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/kobo/rpmlib.py b/kobo/rpmlib.py
+index 228e80e..817db4a 100644
+--- a/kobo/rpmlib.py
++++ b/kobo/rpmlib.py
+@@ -329,7 +329,7 @@ def get_digest_algo_from_header(hdr):
+     hdr_key = getattr(rpm, "RPMTAG_FILEDIGESTALGO", 5011)
+     algo_id = hdr[hdr_key]
+ 
+-    if algo_id == []:
++    if algo_id == [] or algo_id is None:
+         # RPMTAG_FILEDIGESTALGO is empty, fall back to md5
+         algo_id = 1
+ 
+-- 
+1.5.5.6
+
diff --git a/kobo.spec b/kobo.spec
index 4a35cc6..f3b2076 100644
--- a/kobo.spec
+++ b/kobo.spec
@@ -5,8 +5,8 @@
 %define py_sitedir %{py_libdir}/site-packages
 %define debug_package %{nil}
 
-%define version 0.2.1
-%define release 1
+%define version 0.3.0
+%define release 2
 # set git to %{nil} (release) or to YYYYMMDD.123456 (git build)
 %define git     %{nil}
 
@@ -23,7 +23,8 @@ Summary:        Python modules for tools development
 Group:          Development/Libraries
 URL:            https://fedorahosted.org/kobo/
 Source0:        https://fedorahosted.org/releases/k/o/kobo/%{name}-%{version}%{?release_suffix}.tar.bz2
-
+Patch0:         0001-Pass-conf-argument-do-daemonized-worker-s-main_loo.patch
+Patch1:         0002-Fix-kobo.rpmlib.get_digest_algo_from_header-when-R.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -53,6 +54,7 @@ Django components.
 Summary:        CLI client
 Group:          Development/Libraries
 Requires:       kobo = %{version}-%{release}
+Requires:       python-simplejson
 
 %description client
 CLI client.
@@ -90,7 +92,8 @@ Rpmlib contains functions to manipulate with RPM files.
 
 %prep
 %setup -q -n %{name}-%{version}%{?release_suffix}
-
+%patch0 -p1
+%patch1 -p1
 
 %build
 echo OK
@@ -146,6 +149,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 13 2010 Daniel Mach <dmach at redhat.com> - 0.3.0-2
+- Bump to new upstream version.
+- Fix kobo.rpmlib.get_digest_algo_from_header() when RPMTAG_FILEDIGESTALGO contains None value. (Daniel Mach)
+- Pass 'conf' argument do daemonized worker's main_loop. (Daniel Mach)
+
 * Mon Feb 15 2010 Daniel Mach <dmach at redhat.com> - 0.2.1-1
 - Split rpmlib to a subpackage.
 - Add missing "compare_nvr" to __all__. (Daniel Mach)
diff --git a/sources b/sources
index 9c72fc0..97dac7a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea8937975c2a0895d4d486597c52677f  kobo-0.2.1.tar.bz2
+669cef7512b341f1d1609d5d5727e75e  kobo-0.3.0.tar.bz2