From e4b3eb9f51cbc0b6c7a73ea98d9d069483cffea0 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz
Date: Fri, 16 Sep 2011 19:22:39 +0000
Subject: - updated to 3.2.0 (new sonames; now fully parallel installable with
 libnl1) - updated link patch

Changed files:
    libnl-link.patch -> 1.2
    libnl.spec -> 1.35
diff --git a/libnl-link.patch b/libnl-link.patch
index 786acdb..6a516ab 100644
--- a/libnl-link.patch
+++ b/libnl-link.patch
@@ -1,11 +1,29 @@
---- libnl-3.1/src/lib/Makefile.am.orig	2010-10-26 13:36:57.000000000 +0200
-+++ libnl-3.1/src/lib/Makefile.am	2011-08-14 09:22:17.996384902 +0200
-@@ -1,7 +1,7 @@
- # -*- Makefile -*-
+--- libnl-3.2.0/src/lib/Makefile.am.orig	2011-09-13 19:15:01.000000000 +0200
++++ libnl-3.2.0/src/lib/Makefile.am	2011-09-16 18:46:28.999115930 +0200
+@@ -2,7 +2,6 @@
  
  AM_CPPFLAGS  = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DPKGLIBDIR=\"$(pkglibdir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -rdynamic
--AM_LDFLAGS = -L${top_builddir}/lib -ldl -version-info 3:0:0
-+AM_LDFLAGS = -ldl -version-info 3:0:0
+ AM_LDFLAGS = \
+-	-L${top_builddir}/lib \
+ 	-ldl \
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
- #nobase_pkglib_LTLIBRARIES = cls/basic.la cls/ematch/cmp.la
- #cls_basic_la_LDFLAGS = -module -version-info 2:0:0
+--- libnl-3.2.0/python/setup.py.in.orig	2011-08-16 16:15:56.000000000 +0200
++++ libnl-3.2.0/python/setup.py.in	2011-09-16 19:27:31.155865040 +0200
+@@ -9,14 +9,14 @@
+                          sources = ['netlink/capi.i'],
+ 			 include_dirs = include,
+ 			 swig_opts = opts,
+-			 libraries = ['nl'],
++			 libraries = ['nl-3'],
+ 			)
+ 
+ route_capi = Extension('netlink/route/_capi',
+                          sources = ['netlink/route/capi.i'],
+ 			 include_dirs = include,
+ 			 swig_opts = opts,
+-			 libraries = ['nl', 'nl-route'],
++			 libraries = ['nl-3', 'nl-route-3'],
+ 			)
+ 
+ setup(name = 'netlink',
diff --git a/libnl.spec b/libnl.spec
index 5a74c68..70a18d2 100644
--- a/libnl.spec
+++ b/libnl.spec
@@ -5,13 +5,13 @@
 Summary:	Netlink sockets library
 Summary(pl.UTF-8):	Biblioteka do obsługi gniazd netlink
 Name:		libnl
-Version:	3.1
+Version:	3.2.0
 Release:	1
 Epoch:		1
 License:	LGPL v2.1
 Group:		Libraries
 Source0:	http://www.infradead.org/~tgr/libnl/files/%{name}-%{version}.tar.gz
-# Source0-md5:	3bca9af3367d1561c274a0e46edc1ea2
+# Source0-md5:	f69506a9d4c5e86d2a41fc55b825af68
 Patch0:		%{name}-link.patch
 URL:		http://www.infradead.org/~tgr/libnl/
 BuildRequires:	autoconf
@@ -153,16 +153,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/nl-link-list
 %attr(755,root,root) %{_sbindir}/nl-pktloc-lookup
 %attr(755,root,root) %{_sbindir}/nl-qdisc-*
-%attr(755,root,root) %{_libdir}/libnl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnl.so.3
-%attr(755,root,root) %{_libdir}/libnl-cli.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnl-cli.so.3
-%attr(755,root,root) %{_libdir}/libnl-genl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnl-genl.so.3
-%attr(755,root,root) %{_libdir}/libnl-nf.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnl-nf.so.3
-%attr(755,root,root) %{_libdir}/libnl-route.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnl-route.so.3
+%attr(755,root,root) %{_libdir}/libnl-3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnl-3.so.200
+%attr(755,root,root) %{_libdir}/libnl-cli-3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnl-cli-3.so.200
+%attr(755,root,root) %{_libdir}/libnl-genl-3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnl-genl-3.so.200
+%attr(755,root,root) %{_libdir}/libnl-nf-3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnl-nf-3.so.200
+%attr(755,root,root) %{_libdir}/libnl-route-3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnl-route-3.so.200
 %dir %{_libdir}/libnl
 %dir %{_libdir}/libnl/cli
 %dir %{_libdir}/libnl/cli/cls
@@ -175,30 +175,30 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnl.so
-%attr(755,root,root) %{_libdir}/libnl-cli.so
-%attr(755,root,root) %{_libdir}/libnl-genl.so
-%attr(755,root,root) %{_libdir}/libnl-nf.so
-%attr(755,root,root) %{_libdir}/libnl-route.so
+%attr(755,root,root) %{_libdir}/libnl-3.so
+%attr(755,root,root) %{_libdir}/libnl-cli-3.so
+%attr(755,root,root) %{_libdir}/libnl-genl-3.so
+%attr(755,root,root) %{_libdir}/libnl-nf-3.so
+%attr(755,root,root) %{_libdir}/libnl-route-3.so
 # keep *.la: pkgconfig support is incomplete (missing for libnl-cli)
-%{_libdir}/libnl.la
-%{_libdir}/libnl-cli.la
-%{_libdir}/libnl-genl.la
-%{_libdir}/libnl-nf.la
-%{_libdir}/libnl-route.la
-%{_includedir}/netlink
-%{_pkgconfigdir}/libnl-3.1.pc
-%{_pkgconfigdir}/libnl-genl-3.1.pc
-%{_pkgconfigdir}/libnl-nf-3.1.pc
-%{_pkgconfigdir}/libnl-route-3.1.pc
+%{_libdir}/libnl-3.la
+%{_libdir}/libnl-cli-3.la
+%{_libdir}/libnl-genl-3.la
+%{_libdir}/libnl-nf-3.la
+%{_libdir}/libnl-route-3.la
+%{_includedir}/libnl3
+%{_pkgconfigdir}/libnl-3.0.pc
+%{_pkgconfigdir}/libnl-genl-3.0.pc
+%{_pkgconfigdir}/libnl-nf-3.0.pc
+%{_pkgconfigdir}/libnl-route-3.0.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libnl.a
-%{_libdir}/libnl-cli.a
-%{_libdir}/libnl-genl.a
-%{_libdir}/libnl-nf.a
-%{_libdir}/libnl-route.a
+%{_libdir}/libnl-3.a
+%{_libdir}/libnl-cli-3.a
+%{_libdir}/libnl-genl-3.a
+%{_libdir}/libnl-nf-3.a
+%{_libdir}/libnl-route-3.a
 
 %if %{with apidocs}
 %files apidocs
-- 
cgit v0.10.2