Author: arekm Date: Mon Mar 28 18:16:59 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- libnl1.spec with version 1.1
---- Files affected:
packages/libnl1:
libnl1.spec (1.31 -> 1.32) , libnl-ULONG_MAX.patch (1.2 -> 1.3) ,
libnl-gcc44.patch (1.2 -> 1.3) , libnl-static.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: packages/libnl1/libnl1.spec
diff -u packages/libnl1/libnl1.spec:1.31 packages/libnl1/libnl1.spec:1.32
--- packages/libnl1/libnl1.spec:1.31 Sun Mar 27 20:24:52 2011
+++ packages/libnl1/libnl1.spec Mon Mar 28 20:16:54 2011
@@ -5,15 +5,20 @@
#
Summary: Netlink sockets library
Summary(pl.UTF-8): Biblioteka do obsługi gniazd netlink
-Name: libnl
-Version: 3.0
-Release: 2
-Epoch: 1
+%define orgname libnl
+Name: %{orgname}1
+Version: 1.1
+Release: 1
License: LGPL v2.1
Group: Libraries
-Source0:
http://www.infradead.org/~tgr/libnl/files/%{name}-%{version}.tar.gz
-# Source0-md5: 00740414d4d6f173a7dd2aa19432da62
+Source0:
http://people.suug.ch/~tgr/libnl/files/%{orgname}-%{version}.tar.gz
+# Source0-md5: ae970ccd9144e132b68664f98e7ceeb1
+Patch0: %{orgname}-static.patch
+Patch1: %{orgname}-ULONG_MAX.patch
+Patch2: %{orgname}-gcc44.patch
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
@@ -21,62 +26,66 @@
%{?with_apidocs:BuildRequires: tetex-format-latex}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define skip_post_check_so bfifo.so.0.0.0
blackhole.so.0.0.0 htb.so.0.0.0 pfifo.so.0.0.0 basic.so.0.0.0 cgroup.so.0.0.0
-
%description
-libnl is a library for applications dealing with netlink socket. It
+libnl1 is a library for applications dealing with netlink socket. It
provides an easy to use interface for raw netlink message but also
netlink family specific APIs.
%description -l pl.UTF-8
-libnl jest biblioteką dla aplikacji rozmawiających z gniazdem netlink.
+libnl1 jest biblioteką dla aplikacji rozmawiających z gniazdem netlink.
Udostępnia łatwy w użyciu interfejs do korzystania z surowych
wiadomości netlink, a także API specyficzne dla rodziny gniazd
netlink.
%package devel
-Summary: Header files for libnl library
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libnl
+Summary: Header files for libnl1 library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libnl1
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
%description devel
-Header files for libnl library.
+Header files for libnl1 library.
%description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki libnl.
+Pliki nagłówkowe biblioteki libnl1.
%package static
-Summary: Static libnl library
-Summary(pl.UTF-8): Statyczna biblioteka libnl
+Summary: Static libnl1 library
+Summary(pl.UTF-8): Statyczna biblioteka libnl1
Group: Development/Libraries
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
%description static
-Static libnl library.
+Static libnl1 library.
%description static -l pl.UTF-8
-Statyczna biblioteka libnl.
+Statyczna biblioteka libnl1.
%package apidocs
-Summary: libnl library API documentation
-Summary(pl.UTF-8): Dokumentacja API biblioteki libnl
+Summary: libnl1 library API documentation
+Summary(pl.UTF-8): Dokumentacja API biblioteki libnl1
Group: Documentation
%description apidocs
-Documentation for libnl library API and guides in HTML format
+Documentation for libnl1 library API and guides in HTML format
generated from sources by doxygen.
%description apidocs -l pl.UTF-8
-Dokumentacja API biblioteki libnl oraz wprowadzenie w formacie HTML
+Dokumentacja API biblioteki libnl1 oraz wprowadzenie w formacie HTML
wygenerowane ze źródeł za pomocą doxygena.
%prep
-%setup -q
+%setup -q -n %{orgname}-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
+%{__aclocal}
+%{__autoconf}
+
%configure \
- --disable-silent-rules
+ --enable-verbose-errors
%{__make}
%{?with_apidocs:%{__make} -C doc gendoc}
@@ -87,7 +96,8 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libnl/cli/*/*.{la,a}
+# for autodeps to work
+chmod +x $RPM_BUILD_ROOT%{_libdir}/libnl.so.*.*
%clean
rm -rf $RPM_BUILD_ROOT
@@ -98,58 +108,18 @@
%files
%defattr(644,root,root,755)
%doc ChangeLog
-%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*
+%attr(755,root,root) %{_libdir}/libnl.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnl.so.1
%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-3.0.pc
+%{_pkgconfigdir}/libnl-1.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
@@ -163,15 +133,8 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.31 2011/03/27 18:24:52 arekm
-- rel 2; mark modules with skip_post_check_so
-
-Revision 1.30 2011/03/24 19:50:14 qboosh
-- updated to 3.0 (note: new libnl soname; more libs introduced)
-- removed obsolete patches
-
-Revision 1.29 2010/03/25 08:00:23 qboosh
-- updated Source0 URL
+Revision 1.32 2011/03/28 18:16:54 arekm
+- libnl1.spec with version 1.1
Revision 1.28 2009/12/25 21:12:20 glen
- new working url
================================================================
Index: packages/libnl1/libnl-ULONG_MAX.patch
diff -u /dev/null packages/libnl1/libnl-ULONG_MAX.patch:1.3
--- /dev/null Mon Mar 28 20:16:59 2011
+++ packages/libnl1/libnl-ULONG_MAX.patch Mon Mar 28 20:16:54 2011
@@ -0,0 +1,10 @@
+--- 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>
================================================================
Index: packages/libnl1/libnl-gcc44.patch
diff -u /dev/null packages/libnl1/libnl-gcc44.patch:1.3
--- /dev/null Mon Mar 28 20:16:59 2011
+++ packages/libnl1/libnl-gcc44.patch Mon Mar 28 20:16:54 2011
@@ -0,0 +1,10 @@
+--- 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
+ }
================================================================
Index: packages/libnl1/libnl-static.patch
diff -u /dev/null packages/libnl1/libnl-static.patch:1.4
--- /dev/null Mon Mar 28 20:16:59 2011
+++ packages/libnl1/libnl-static.patch Mon Mar 28 20:16:54 2011
@@ -0,0 +1,39 @@
+--- 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)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libnl1/libnl1.spec?r1=1.31&r2=1.32&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libnl1/libnl-ULONG_MAX.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libnl1/libnl-gcc44.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libnl1/libnl-static.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
