From d0bbe45460d239c13de8a345a1107797da9e8ee27836bdd6bcadd575a23556d3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 29 Jun 2012 22:41:34 +0000 Subject: [PATCH 1/4] Rip out dependence on patch OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnl3?expand=0&rev=31 --- libdir.diff | 23 ----------------------- libnl3.spec | 25 ++++++++----------------- 2 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 libdir.diff diff --git a/libdir.diff b/libdir.diff deleted file mode 100644 index 967a629..0000000 --- a/libdir.diff +++ /dev/null @@ -1,23 +0,0 @@ -From: Jan Engelhardt -Date: 2011-09-14 10:16:16.747806482 +0200 -Upstream: possibly not - -Quick hack to make pkglibdir include the version. - ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: libnl-3.2.8/configure.in -=================================================================== ---- libnl-3.2.8.orig/configure.in -+++ libnl-3.2.8/configure.in -@@ -41,7 +41,7 @@ m4_define([libnl_lt_age], [6]) - m4_define([libnl_version], - [libnl_major_version.libnl_minor_version.libnl_micro_version]) - --AC_INIT(libnl, [libnl_version], [http://www.infradead.org/~tgr/libnl/]) -+AC_INIT(libnl3-200, [libnl_version], [http://www.infradead.org/~tgr/libnl/]) - AC_CONFIG_HEADERS([lib/defs.h]) - AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) diff --git a/libnl3.spec b/libnl3.spec index c452431..cc3a4a2 100644 --- a/libnl3.spec +++ b/libnl3.spec @@ -30,17 +30,15 @@ Url: http://people.suug.ch/~tgr/libnl/ #Git-Clone: git://git.infradead.org/users/tgr/libnl Source: libnl-%version.tar.bz2 Source2: baselibs.conf -Patch1: libdir.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf -BuildRequires: automake BuildRequires: bison -BuildRequires: fdupes -BuildRequires: flex +BuildRequires: flex >= 2.5.19 BuildRequires: libtool BuildRequires: pkgconfig >= 0.23 BuildRequires: python-devel -BuildRequires: xz +%if 0%{?suse_version} +BuildRequires: fdupes +%endif %description The libnl suite is a collection of libraries providing APIs to @@ -99,33 +97,26 @@ demonstrated. %endif %prep -%if 0%{?__xz:1} %setup -qn libnl-%version -%else -tar -xf "%{S:0}" --use=xz; -%setup -DTqn libnl-%version -%endif -%patch -P 1 -p1 %build -# we do have patches -autoreconf -fi; - if [ ! -e configure ]; then autoreconf -fi; fi; %configure --disable-static -make %{?_smp_mflags}; +make %{?_smp_mflags} pkglibdir="%_libdir/%lname"; %install b="%buildroot"; -%makeinstall +make install DESTDIR="%buildroot" pkglibdir="%_libdir/%lname"; find "$b" -iname "*.la" -delete; %if !%with_tools rm -Rf "$b/%_sysconfdir/libnl"; rm -Rf "$b/%_sbindir" "$b/%_mandir/man8"; %endif +%if "%{?fudes:1}" %fdupes %buildroot +%endif %post -n %lname -p /sbin/ldconfig From df1b57e5fa1fba905102f5a623a964053de363469723409b9ef4a2bef0fdc424 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 30 Jun 2012 13:28:23 +0000 Subject: [PATCH 2/4] Packaging fixes for RHEL/SLES OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnl3?expand=0&rev=32 --- libnl3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnl3.spec b/libnl3.spec index cc3a4a2..c60f2b6 100644 --- a/libnl3.spec +++ b/libnl3.spec @@ -35,7 +35,7 @@ BuildRequires: bison BuildRequires: flex >= 2.5.19 BuildRequires: libtool BuildRequires: pkgconfig >= 0.23 -BuildRequires: python-devel +BuildRequires: python-devel >= 2.6 %if 0%{?suse_version} BuildRequires: fdupes %endif From dc5d3ce705676a72fb476c367665014f86e5f34c89569e8efb07993b7d3123a8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 30 Jun 2012 18:28:59 +0000 Subject: [PATCH 3/4] Trim BuildRequires OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnl3?expand=0&rev=33 --- libnl3.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libnl3.spec b/libnl3.spec index c60f2b6..f4adbc4 100644 --- a/libnl3.spec +++ b/libnl3.spec @@ -31,10 +31,10 @@ Url: http://people.suug.ch/~tgr/libnl/ Source: libnl-%version.tar.bz2 Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build +#git#BuildRequires: autoconf, automake, libtool BuildRequires: bison BuildRequires: flex >= 2.5.19 -BuildRequires: libtool -BuildRequires: pkgconfig >= 0.23 +BuildRequires: pkgconfig >= 0.21 BuildRequires: python-devel >= 2.6 %if 0%{?suse_version} BuildRequires: fdupes From 701ae22d223563e2e81ce3aaf694d4896972f3966165d082f10eec9e5fc0cf46 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 31 Aug 2012 02:01:20 +0000 Subject: [PATCH 4/4] libnl-3.2.12 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnl3?expand=0&rev=34 --- libnl-3.2.11.tar.bz2 | 3 --- libnl-3.2.12.tar.xz | 3 +++ libnl3.changes | 7 +++++++ libnl3.spec | 5 +++-- 4 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 libnl-3.2.11.tar.bz2 create mode 100644 libnl-3.2.12.tar.xz diff --git a/libnl-3.2.11.tar.bz2 b/libnl-3.2.11.tar.bz2 deleted file mode 100644 index 6721b98..0000000 --- a/libnl-3.2.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:432c17513e1a1e9a0f06323d552022bbe712a39b61352fa464c93355b411add3 -size 972409 diff --git a/libnl-3.2.12.tar.xz b/libnl-3.2.12.tar.xz new file mode 100644 index 0000000..dbe3798 --- /dev/null +++ b/libnl-3.2.12.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c665157ef3823e0862298290d49bda725c0df816209fb627e089ece29baf4f1c +size 908076 diff --git a/libnl3.changes b/libnl3.changes index 070a102..329234b 100644 --- a/libnl3.changes +++ b/libnl3.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 31 01:55:51 UTC 2012 - jengelh@inai.de + +- Update to new upstream release 3.2.12 +* Add new API to retrieve versioning information at runtime + suitable for python ctype. + ------------------------------------------------------------------- Tue Jun 19 13:35:16 UTC 2012 - jengelh@inai.de diff --git a/libnl3.spec b/libnl3.spec index f4adbc4..622d116 100644 --- a/libnl3.spec +++ b/libnl3.spec @@ -19,7 +19,7 @@ Name: libnl3 %define lname libnl3-200 %define with_tools 1 -Version: 3.2.11 +Version: 3.2.12 Release: 0 Summary: Convenience library for working with Netlink sockets License: LGPL-2.1 and GPL-2.0 @@ -28,7 +28,7 @@ Group: Development/Libraries/C and C++ Url: http://people.suug.ch/~tgr/libnl/ #Git-Clone: git://git.kernel.org/pub/scm/libs/netlink/libnl #Git-Clone: git://git.infradead.org/users/tgr/libnl -Source: libnl-%version.tar.bz2 +Source: libnl-%version.tar.xz Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf, automake, libtool @@ -36,6 +36,7 @@ BuildRequires: bison BuildRequires: flex >= 2.5.19 BuildRequires: pkgconfig >= 0.21 BuildRequires: python-devel >= 2.6 +BuildRequires: xz %if 0%{?suse_version} BuildRequires: fdupes %endif