[libnl3/f22] revert update to libnl-3.2.26-rc1 to previous version

[thaller]

commit b49cbca2dc456f1676b065d70b63a23f06e089da
Author: Thomas Haller <thaller at redhat.com>
Date:   Sat Mar 7 08:28:48 2015 +0100

    revert update to libnl-3.2.26-rc1 to previous version
    
    Upstream moved some symbols since the last stable release. Since we
    already ported some of these symbols to Fedora rawhide and 22, this
    causes problems.
    
    As a quick fix, revert the update. Solve it later.

 .gitignore  |  2 --
 libnl3.spec | 13 +++++++++++--
 sources     |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6542bbe..0154274 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,5 +13,3 @@
 /libnl-doc-3.2.25-rc1.tar.gz
 /libnl-3.2.25.tar.gz
 /libnl-doc-3.2.25.tar.gz
-/libnl-3.2.26-rc1.tar.gz
-/libnl-doc-3.2.26-rc1.tar.gz
diff --git a/libnl3.spec b/libnl3.spec
index 8b7c6a8..c8a7121 100644
--- a/libnl3.spec
+++ b/libnl3.spec
@@ -1,15 +1,18 @@
 Name: libnl3
 Version: 3.2.26
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Convenience library for kernel netlink sockets
 Group: Development/Libraries
 License: LGPLv2
 URL: http://www.infradead.org/~tgr/libnl/
 
-%define fullversion %{version}-rc1
+%define fullversion %{version}
 
 Source: http://www.infradead.org/~tgr/libnl/files/libnl-%{fullversion}.tar.gz
 Source1: http://www.infradead.org/~tgr/libnl/files/libnl-doc-%{fullversion}.tar.gz
+Patch1: 0001-link-inet6-add-support-for-tokenized-interface-ident.patch
+Patch2: 0002-i6-addr-gen-mode.patch
+Patch3: 0003-fix-python-meta-data.patch
 
 BuildRequires: flex bison
 BuildRequires: python
@@ -68,6 +71,9 @@ Python 3 bindings for libnl3
 
 %prep
 %setup -q -n libnl-%{fullversion}
+%patch1 -p1 -b .0001-link-inet6-add-support-for-tokenized-interface-ident.orig
+%patch2 -p1 -b .0002-i6-addr-gen-mode.orig
+%patch3 -p1 -b .0003-fix-python-meta-data.orig
 
 tar -xzf %SOURCE1
 
@@ -148,6 +154,9 @@ popd
 %{python3_sitearch}/netlink-*.egg-info
 
 %changelog
+* Fri Mar  7 2015 Thomas Haller <thaller at redhat.com> - 3.2.26-2
+* Revert update to 3.2.26-rc1 to previous 3.2.25-6
+
 * Fri Mar  6 2015 Thomas Haller <thaller at redhat.com> - 3.2.26-1
 * Update to 3.2.26-rc1
 
diff --git a/sources b/sources
index 3e80049..91cbf64 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1d2bf6120ec2f479df9aa43d876f06b9  libnl-3.2.26-rc1.tar.gz
-5af8721bedc132c9fb8bcc3f2c6ee2f9  libnl-doc-3.2.26-rc1.tar.gz
+03f74d0cd5037cadc8cdfa313bbd195c  libnl-3.2.25.tar.gz
+641f73052d9f54e720efe1a476a20237  libnl-doc-3.2.25.tar.gz