- updated to 3.0 (note: new libnl soname; more libs introduced)

- removed obsolete patches

Changed files:
    libnl-ULONG_MAX.patch -> 1.2
    libnl-gcc44.patch -> 1.2
    libnl-static.patch -> 1.3
    libnl.spec -> 1.30

diff --git a/libnl-ULONG_MAX.patch b/libnl-ULONG_MAX.patch
deleted file mode 100644 (file)
index 9476098..0000000
--- a/libnl-ULONG_MAX.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libnl-1.1/include/netlink-local.h.orig     2008-01-14 16:48:45.000000000 +0100
-+++ libnl-1.1/include/netlink-local.h  2008-05-19 09:35:18.000000000 +0200
-@@ -26,6 +26,7 @@
- #include <sys/socket.h>
- #include <inttypes.h>
- #include <assert.h>
-+#include <limits.h>
- 
- #include <arpa/inet.h>
- #include <netdb.h>

diff --git a/libnl-gcc44.patch b/libnl-gcc44.patch
deleted file mode 100644 (file)
index 2f24ba3..0000000
--- a/libnl-gcc44.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libnl-1.1/include/netlink/object.h~        2008-01-14 17:48:45.000000000 +0200
-+++ libnl-1.1/include/netlink/object.h 2009-05-28 00:47:33.434187052 +0300
-@@ -55,7 +55,6 @@
- /* Access Functions */
- extern int                    nl_object_get_refcnt(struct nl_object *);
- extern struct nl_cache *      nl_object_get_cache(struct nl_object *);
--extern inline void *          nl_object_priv(struct nl_object *);
- 
- #ifdef __cplusplus
- }

diff --git a/libnl-static.patch b/libnl-static.patch
deleted file mode 100644 (file)
index d5fc719..0000000
--- a/libnl-static.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- libnl-1.0-pre5/lib/Makefile.static 2006-05-26 01:37:40.000000000 -0400
-+++ libnl-1.0-pre5/lib/Makefile        2006-05-26 01:38:31.000000000 -0400
-@@ -28,6 +28,7 @@
- OBJ      := $(CIN:%.c=%.o)
- CFLAGS   += -fPIC
- OUT_SLIB := $(PACKAGE_NAME).so.$(PACKAGE_VERSION)
-+OUT_AR   := $(PACKAGE_NAME).a
- LN_SLIB  := $(PACKAGE_NAME).so
- LN1_SLIB := $(LN_SLIB).1
- 
-@@ -38,7 +39,8 @@
- 
- all:
-       @echo "  MAKE $(OUT_SLIB)"; \
--      $(MAKE) $(OUT_SLIB)
-+      $(MAKE) $(OUT_SLIB); \
-+      $(MAKE) $(OUT_AR)
- 
- $(OUT_SLIB): ../Makefile.opts $(OBJ)
-       @echo "  LD $(OUT_SLIB)"; \
-@@ -48,6 +50,10 @@
-       @echo "  LN $(LN1_SLIB) $(LN_SLIB)"; \
-       rm -f $(LN_SLIB) ; $(LN) -s $(LN1_SLIB) $(LN_SLIB)
- 
-+$(OUT_AR):  ../Makefile.opts $(OBJ)
-+      @echo "  AR $(OUT_AR)"; \
-+      $(AR) crus $(OUT_AR) $(OBJ)
-+
- clean:
-       @echo "  CLEAN lib"; \
-       $(RM) -f $(OBJ) $(OUT_SLIB) $(LN_SLIB) $(LN1_SLIB); \
-@@ -59,6 +65,7 @@
- install:
-       mkdir -p $(DESTDIR)$(libdir)/
-       install -m 0644 $(OUT_SLIB) $(DESTDIR)$(libdir)
-+      install -m 0644 $(OUT_AR) $(DESTDIR)$(libdir)
-       rm -f $(DESTDIR)$(libdir)/$(LN1_SLIB)
-       $(LN) -s $(OUT_SLIB) $(DESTDIR)$(libdir)/$(LN1_SLIB)
-       rm -f $(DESTDIR)$(libdir)/$(LN_SLIB)

diff --git a/libnl.spec b/libnl.spec
index 7e00354e3477c86f00b315ca736d1d760d837bf6..6be730ce501cff72cb55826315573b9f1549f6a0 100644 (file)
--- a/libnl.spec
+++ b/libnl.spec
@@ -5,19 +5,14 @@
 Summary:       Netlink sockets library
 Summary(pl.UTF-8):     Biblioteka do obsługi gniazd netlink
 Name:          libnl
-Version:       1.1
-Release:       4
+Version:       3.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: ae970ccd9144e132b68664f98e7ceeb1
-Patch0:                %{name}-static.patch
-Patch1:                %{name}-ULONG_MAX.patch
-Patch2:                %{name}-gcc44.patch
+# Source0-md5: 00740414d4d6f173a7dd2aa19432da62
 URL:           http://www.infradead.org/~tgr/libnl/
-BuildRequires: autoconf
-BuildRequires: automake
 %{?with_apidocs:BuildRequires: doxygen}
 %{?with_apidocs:BuildRequires: graphviz}
 BuildRequires: linux-libc-headers >= 6:2.6.23
@@ -75,16 +70,10 @@ wygenerowane ze źródeł za pomocą doxygena.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
-%{__aclocal}
-%{__autoconf}
-
 %configure \
-       --enable-verbose-errors
+       --disable-silent-rules
 
 %{__make}
 %{?with_apidocs:%{__make} -C doc gendoc}
@@ -95,8 +84,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-# for autodeps to work
-chmod +x $RPM_BUILD_ROOT%{_libdir}/libnl.so.*.*
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libnl/cli/*/*.{la,a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -107,18 +95,58 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog
-%attr(755,root,root) %{_libdir}/libnl.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnl.so.1
+%dir %{_sysconfdir}/libnl
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libnl/classid
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libnl/pktloc
+%attr(755,root,root) %{_sbindir}/nl-class-*
+%attr(755,root,root) %{_sbindir}/nl-classid-lookup
+%attr(755,root,root) %{_sbindir}/nl-cls-*
+%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
+%dir %{_libdir}/libnl
+%dir %{_libdir}/libnl/cli
+%dir %{_libdir}/libnl/cli/cls
+%attr(755,root,root) %{_libdir}/libnl/cli/cls/*.so*
+%dir %{_libdir}/libnl/cli/qdisc
+%attr(755,root,root) %{_libdir}/libnl/cli/qdisc/*.so*
+%{_mandir}/man8/nl-classid-lookup.8*
+%{_mandir}/man8/nl-pktloc-lookup.8*
+%{_mandir}/man8/nl-qdisc-*.8*
 
 %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
+# keep *.la: pkgconfig support is incomplete
+%{_libdir}/libnl.la
+%{_libdir}/libnl-cli.la
+%{_libdir}/libnl-genl.la
+%{_libdir}/libnl-nf.la
+%{_libdir}/libnl-route.la
 %{_includedir}/netlink
-%{_pkgconfigdir}/libnl-1.pc
+%{_pkgconfigdir}/libnl-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
 
 %if %{with apidocs}
 %files apidocs