From a378863525b640ff8a840e53ebed43c0d0cf8ee10f6dc50903e60cd61db4df2e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 17 Nov 2012 06:25:41 +0000 Subject: [PATCH] Accepting request 141363 from devel:libraries:c_c++ - Update to git snapshot 0+git368 [a62cd9309607c6d72d46ef68403a730a6367b827] - no changes summary provided by upstream - Install systemd service file for teamd - Build and install python bindings OBS-URL: https://build.opensuse.org/request/show/141363 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libteam?expand=0&rev=3 --- libteam-0.0+git216.tar.xz | 3 -- libteam-0.0+git368.tar.xz | 3 ++ libteam.changes | 8 +++++ libteam.spec | 67 ++++++++++++++++++++++++++++++++------- soversion.diff | 2 +- 5 files changed, 67 insertions(+), 16 deletions(-) delete mode 100644 libteam-0.0+git216.tar.xz create mode 100644 libteam-0.0+git368.tar.xz diff --git a/libteam-0.0+git216.tar.xz b/libteam-0.0+git216.tar.xz deleted file mode 100644 index 27a0c2a..0000000 --- a/libteam-0.0+git216.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:148112c4ee480248f5188ec76b288eb1b2fc581ee0b260aa3a335930a455f47c -size 53824 diff --git a/libteam-0.0+git368.tar.xz b/libteam-0.0+git368.tar.xz new file mode 100644 index 0000000..559860f --- /dev/null +++ b/libteam-0.0+git368.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0dbec0c2710115bbb25bf115c90d0729f62fbb8ba36a5f1056fc42588bf2a544 +size 287100 diff --git a/libteam.changes b/libteam.changes index fadf2e2..aed2eee 100644 --- a/libteam.changes +++ b/libteam.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Nov 14 23:47:08 UTC 2012 - jengelh@inai.de + +- Update to git snapshot 0+git368 [a62cd9309607c6d72d46ef68403a730a6367b827] - + no changes summary provided by upstream +- Install systemd service file for teamd +- Build and install python bindings + ------------------------------------------------------------------- Sat May 12 00:06:17 UTC 2012 - jengelh@inai.de diff --git a/libteam.spec b/libteam.spec index 1b19d30..b83fbd7 100644 --- a/libteam.spec +++ b/libteam.spec @@ -14,25 +14,39 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: libteam %define lname libteam-0p0 Summary: Utilities for controlling 802.1AX team network device License: LGPL-2.1+ Group: System/Kernel -Version: 0.0+git216 +Version: 0.0+git368 Release: 0 Url: https://fedorahosted.org/libteam/ #Git-Web: https://github.com/jpirko/libteam #Git-Clone: git://github.com/jpirko/libteam Source: %name-%version.tar.xz -Patch1: soversion.diff +Patch1: soversion.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf automake libtool xz -BuildRequires: pkgconfig(libnl-3.0) pkgconfig(libnl-genl-3.0) -BuildRequires: pkgconfig(libnl-cli-3.0) pkgconfig(libdaemon) -BuildRequires: pkgconfig(jansson) pkgconfig(dbus-1) pkgconfig +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: python-devel +BuildRequires: swig +BuildRequires: xz +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(jansson) +BuildRequires: pkgconfig(libdaemon) +BuildRequires: pkgconfig(libnl-3.0) >= 3.2.0 +BuildRequires: pkgconfig(libnl-cli-3.0) >= 3.2.0 +BuildRequires: pkgconfig(libnl-genl-3.0) >= 3.2.0 +%if 0%{?suse_version} >= 1220 +BuildRequires: systemd +%endif %description A library which is the user-space counterpart for the team network @@ -44,7 +58,6 @@ It is a userspace-driven alternative to the existing bonding driver. %package -n %lname Summary: Library for controlling 802.1AX team network device -License: LGPL-2.1+ Group: System/Libraries %description -n %lname @@ -68,8 +81,8 @@ This package contains the development headers for the library found in %lname. %package tools -Summary: Utilities for controlling team network devices -Group: System/Daemons +Summary: Utilities for controlling team network devices +Group: System/Daemons %description tools This package contains frontends to libteam that allow changing @@ -81,6 +94,15 @@ Linux kernel 3.3 and above offer a so-called "team" network driver - a lightweight mechanism for bonding multiple interfaces together. It is a userspace-driven alternative to the existing bonding driver. +%package -n python-libteam +Summary: Python bindings for libteam +Group: Development/Languages/Python + +%description -n python-libteam +This package should be installed if you want to develop Python +programs that will manipulate team network devices. + + %prep %setup -qn %name %patch -P 1 -p1 @@ -94,9 +116,22 @@ fi # Use CFLAGS= to kill -Werror make %{?_smp_mflags} CFLAGS="%optflags" +pushd binding/python/; +python ./setup.py build; +popd; + %install -%make_install -rm -f %buildroot/%_libdir/*.la +b="%buildroot"; +make install DESTDIR="$b"; +pushd binding/python/; +python ./setup.py install --root="$b" --prefix="%_prefix"; +popd; + +rm -f "$b/%_libdir"/*.la +%if 0%{?_unitdir:1} +mkdir -p "$b/%_unitdir"; +install -pm0644 teamd/redhat/systemd/*.service "$b/%_unitdir/"; +%endif %check make check @@ -113,11 +148,19 @@ make check %defattr(-,root,root) %_includedir/%name-%version %_libdir/libteam.so -%_libdir/pkgconfig/*.pc +%_libdir/pkgconfig/libteam.pc %files tools %defattr(-,root,root) %_sbindir/team* +%_mandir/man5/* %_mandir/man8/* +%if 0%{?_unitdir:1} +%_unitdir +%endif + +%files -n python-libteam +%defattr(-,root,root) +%python_sitearch/* %changelog diff --git a/soversion.diff b/soversion.diff index 0112aec..f05b3b6 100644 --- a/soversion.diff +++ b/soversion.diff @@ -17,7 +17,7 @@ Index: libteam/lib/Makefile.am --- libteam.orig/lib/Makefile.am +++ libteam/lib/Makefile.am @@ -6,7 +6,7 @@ lib_LTLIBRARIES = libteam.la - libteam_la_SOURCES = libteam.c ports.c options.c ifinfo.c + libteam_la_SOURCES = libteam.c ports.c options.c ifinfo.c stringify.c libteam_la_CFLAGS= $(LIBNL_CFLAGS) -I${top_srcdir}/include -D_GNU_SOURCE libteam_la_LIBADD= $(LIBNL_LIBS) -libteam_la_LDFLAGS = -version-info @LIBTEAM_CURRENT@:@LIBTEAM_REVISION@:@LIBTEAM_AGE@