[libteam/f16] Rebase to git commit b5cf2a8

[Jiří Pírko]

commit 7566e0e5453b05c3450c32e8e33a72c82d71f9a8
Author: Jiri Pirko <jpirko at redhat.com>
Date:   Mon Jan 30 10:58:44 2012 +0100

    Rebase to git commit b5cf2a8

 .gitignore                                         |    1 +
 libteam.spec                                       |   17 +++++-----
 sources                                            |    2 +-
 ...son-is_error-macro-for-json_tokener_parse.patch |   33 --------------------
 4 files changed, 10 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7a9f3e2..8cb4083 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /libteam-20120113git302672e.tar.gz
 /libteam-20120125gita1718f8.tar.gz
+/libteam-20120130gitb5cf2a8.tar.gz
diff --git a/libteam.spec b/libteam.spec
index 61ba34f..a9c0cc6 100644
--- a/libteam.spec
+++ b/libteam.spec
@@ -1,6 +1,6 @@
 Name: libteam
 Version: 0.1
-Release: 2.20120125gita1718f8%{?dist}
+Release: 3.20120130gitb5cf2a8%{?dist}
 Summary: Library for controlling team network device
 Group: System Environment/Libraries
 License: LGPLv2+
@@ -9,21 +9,18 @@ URL: http://www.libteam.org
 # following commands to generate the tarball:
 #  git clone git://github.com/jpirko/libteam.git
 #  cd libteam/
-#  git reset --hard a1718f8
+#  git reset --hard b5cf2a8
 #  ./autogen.sh
 #  ./configure
 #  make distcheck
-#  mv libteam-0.1.tar.gz libteam-20120125gita1718f8.tar.gz
-Source0: libteam-20120125gita1718f8.tar.gz
-BuildRequires: json-c-devel
+#  mv libteam-0.1.tar.gz libteam-20120130gitb5cf2a8.tar.gz
+Source0: libteam-20120130gitb5cf2a8.tar.gz
+BuildRequires: jansson-devel
 BuildRequires: libdaemon-devel
 BuildRequires: libnl3-devel
 BuildRequires: python-devel
 BuildRequires: swig
 
-# F16 specific patch, not upstream
-Patch0: teamd-use-json-is_error-macro-for-json_tokener_parse.patch
-
 %description
 This package contains a library which is a user-space
 counterpart for team network driver. It provides an API
@@ -66,7 +63,6 @@ programs that will manipulate team network devices.
 
 %prep
 %setup -q
-%patch0 -p1
 
 # prepare example dir for -devel
 mkdir -p _tmpdoc1/examples
@@ -117,6 +113,9 @@ python ./setup.py install --root $RPM_BUILD_ROOT -O1
 %{python_sitearch}/*
 
 %changelog
+* Mon Jan 30 2012 Jiri Pirko <jpirko at redhat.com> - 0.1-3.20120130gitb5cf2a8
+- Rebase to git commit b5cf2a8
+
 * Wed Jan 25 2012 Jiri Pirko <jpirko at redhat.com> - 0.1-2.20120125gita1718f8
 - teamd: use json is_error macro for json_tokener_parse() result check
 - Rebase to git commit a1718f8
diff --git a/sources b/sources
index 6035643..8852dff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-987d5f6a52cac2f66c11acfc1589a1f2  libteam-20120125gita1718f8.tar.gz
+2c3fe9b39d506f50ab6e9b3e4ee3d1a1  libteam-20120130gitb5cf2a8.tar.gz