From cfb90f4d8c1d25578a260d9125acf911aa918bf70feb586ce1f37c05f33ef3cb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 5 Jan 2018 00:28:58 +0000 Subject: [PATCH 1/2] Accepting request 561370 from openSUSE:Factory:Staging:O - Remove defattr that is not really needed - Add condition around python bindings, they are really based on swig code that would need to be rewritten to support python3 [+ 0001-allow-send_interface-dbus.patch] OBS-URL: https://build.opensuse.org/request/show/561370 OBS-URL: https://build.opensuse.org/package/show/network/libteam?expand=0&rev=15 --- libteam.changes | 10 +++++++++- libteam.spec | 48 +++++++++++++++++++++++++----------------------- 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/libteam.changes b/libteam.changes index 804386b..b8b3f99 100644 --- a/libteam.changes +++ b/libteam.changes @@ -1,8 +1,16 @@ +------------------------------------------------------------------- +Wed Jan 3 14:07:18 UTC 2018 - tchvatal@suse.com + +- Remove defattr that is not really needed +- Add condition around python bindings, they are really based on + swig code that would need to be rewritten to support python3 + ------------------------------------------------------------------- Wed Nov 22 16:52:51 CET 2017 - ndas@suse.de - allow send_interface in dbus conf file for wicked. - [+ 0001-allow-send_interface-dbus.patch] + [+ 0001-allow-send_interface-dbus.patch] + ------------------------------------------------------------------- Wed Nov 22 11:17:03 UTC 2017 - jengelh@inai.de diff --git a/libteam.spec b/libteam.spec index 0e12549..e9fe5e3 100644 --- a/libteam.spec +++ b/libteam.spec @@ -1,7 +1,7 @@ # # spec file for package libteam # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,12 @@ # +%bcond_without python2 +%define teamd_user teamd +%define teamd_group daemon +%define teamd_daemon_directory /run/teamd +%define teamd_dbus_policy_directory %_sysconfdir/dbus-1/system.d +%define teamd_dbus_policy_name org.libteam.teamd.conf Name: libteam Version: 1.27 Release: 0 @@ -23,15 +29,16 @@ Summary: Utilities for controlling 802.1AX team network device License: LGPL-2.1+ Group: System/Kernel Url: http://libteam.org/ - #Git-Web: https://github.com/jpirko/libteam #Git-Clone: git://github.com/jpirko/libteam Source: http://libteam.org/files/%name-%version.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch0: check_if_psr_ops_were_initialized.patch +Patch1: start_teamd_from_usr_sbin.patch +Patch2: ignore_ebusy_for_team_hwaddr_set.patch +Patch3: 0001-allow-send_interface-dbus.patch BuildRequires: doxygen BuildRequires: libcap-devel -BuildRequires: pkg-config -BuildRequires: python-devel +BuildRequires: pkgconfig BuildRequires: swig BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(jansson) @@ -40,18 +47,12 @@ 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 BuildRequires: pkgconfig(libnl-route-3.0) >= 3.2.0 +%if %{with python2} +BuildRequires: pkgconfig(python2) +%endif %if 0%{?suse_version} >= 1220 BuildRequires: systemd-rpm-macros %endif -Patch0: check_if_psr_ops_were_initialized.patch -Patch1: start_teamd_from_usr_sbin.patch -Patch2: ignore_ebusy_for_team_hwaddr_set.patch -Patch3: 0001-allow-send_interface-dbus.patch -%define teamd_user teamd -%define teamd_group daemon -%define teamd_daemon_directory /run/teamd -%define teamd_dbus_policy_directory %_sysconfdir/dbus-1/system.d -%define teamd_dbus_policy_name org.libteam.teamd.conf %description A library which is the user-space counterpart for the team network @@ -126,23 +127,27 @@ programs that will manipulate team network devices. %build %configure --includedir="%_includedir/pkg/%name" --bindir="%_sbindir" \ + --disable-silent-rules \ --disable-static \ --with-run-dir=%teamd_daemon_directory \ --with-user=%teamd_user \ --with-group=%teamd_group # Use CFLAGS= to kill -Werror make %{?_smp_mflags} CFLAGS="%optflags" - +%if %{with python2} pushd binding/python/ python ./setup.py build popd +%endif %install -b="%buildroot" +b=%{buildroot} %make_install +%if %{with python2} pushd binding/python/ python ./setup.py install --root="$b" --prefix="%_prefix" popd +%endif rm -f "$b/%_libdir"/*.la %if 0%{?_unitdir:1} @@ -171,7 +176,7 @@ test -L %teamd_daemon_directory || rm -rf %teamd_daemon_directory && : %post tools # reload dbus to apply new teamd's policy -/usr/bin/systemctl reload dbus.service 2>/dev/null || : +%{_bindir}/systemctl reload dbus.service 2>/dev/null || : %if 0%{?_unitdir:1} %service_add_post teamd@.service %endif @@ -187,7 +192,7 @@ test -L %teamd_daemon_directory || rm -rf %teamd_daemon_directory && : %endif # reload dbus to forget teamd's policy if [ ${FIRST_ARG:-$1} -eq 0 ]; then - /usr/bin/systemctl reload dbus.service 2>/dev/null || : + %{_bindir}/systemctl reload dbus.service 2>/dev/null || : fi %post -n libteam5 -p /sbin/ldconfig @@ -196,22 +201,18 @@ fi %postun -n libteamdctl0 -p /sbin/ldconfig %files -n libteam5 -%defattr(-,root,root) %_libdir/libteam.so.5* %files -n libteamdctl0 -%defattr(-,root,root) %_libdir/libteamdctl.so.0* %files devel -%defattr(-,root,root) %_includedir/pkg/ %_libdir/libteam.so %_libdir/libteamdctl.so %_libdir/pkgconfig/libteam*.pc %files tools -%defattr(-,root,root) %_sbindir/bond2team %_sbindir/team* %dir %_sysconfdir/dbus-1 @@ -224,8 +225,9 @@ fi %_unitdir %endif +%if %{with python2} %files -n python-libteam -%defattr(-,root,root) %python_sitearch/* +%endif %changelog From 65e2ff8c8cae816cefbd3a077b162b9a5eabf838ad7ee522ac28e2774905ba9f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 5 Jan 2018 00:34:33 +0000 Subject: [PATCH 2/2] - Drop /pkg/ subpart from includedir OBS-URL: https://build.opensuse.org/package/show/network/libteam?expand=0&rev=16 --- libteam.changes | 5 +++++ libteam.spec | 25 +++++++++++++------------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/libteam.changes b/libteam.changes index b8b3f99..3600682 100644 --- a/libteam.changes +++ b/libteam.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 5 00:31:20 UTC 2018 - jengelh@inai.de + +- Drop /pkg/ subpart from includedir + ------------------------------------------------------------------- Wed Jan 3 14:07:18 UTC 2018 - tchvatal@suse.com diff --git a/libteam.spec b/libteam.spec index e9fe5e3..74583a1 100644 --- a/libteam.spec +++ b/libteam.spec @@ -17,11 +17,6 @@ %bcond_without python2 -%define teamd_user teamd -%define teamd_group daemon -%define teamd_daemon_directory /run/teamd -%define teamd_dbus_policy_directory %_sysconfdir/dbus-1/system.d -%define teamd_dbus_policy_name org.libteam.teamd.conf Name: libteam Version: 1.27 Release: 0 @@ -29,6 +24,7 @@ Summary: Utilities for controlling 802.1AX team network device License: LGPL-2.1+ Group: System/Kernel Url: http://libteam.org/ + #Git-Web: https://github.com/jpirko/libteam #Git-Clone: git://github.com/jpirko/libteam Source: http://libteam.org/files/%name-%version.tar.gz @@ -38,7 +34,7 @@ Patch2: ignore_ebusy_for_team_hwaddr_set.patch Patch3: 0001-allow-send_interface-dbus.patch BuildRequires: doxygen BuildRequires: libcap-devel -BuildRequires: pkgconfig +BuildRequires: pkg-config BuildRequires: swig BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(jansson) @@ -53,6 +49,11 @@ BuildRequires: pkgconfig(python2) %if 0%{?suse_version} >= 1220 BuildRequires: systemd-rpm-macros %endif +%define teamd_user teamd +%define teamd_group daemon +%define teamd_daemon_directory /run/teamd +%define teamd_dbus_policy_directory %_sysconfdir/dbus-1/system.d +%define teamd_dbus_policy_name org.libteam.teamd.conf %description A library which is the user-space counterpart for the team network @@ -126,7 +127,7 @@ programs that will manipulate team network devices. %patch3 -p1 %build -%configure --includedir="%_includedir/pkg/%name" --bindir="%_sbindir" \ +%configure --includedir="%_includedir/%name" --bindir="%_sbindir" \ --disable-silent-rules \ --disable-static \ --with-run-dir=%teamd_daemon_directory \ @@ -141,7 +142,7 @@ popd %endif %install -b=%{buildroot} +b="%buildroot" %make_install %if %{with python2} pushd binding/python/ @@ -167,7 +168,7 @@ make check getent group daemon >/dev/null || %_sbindir/groupadd -r %teamd_group getent passwd %teamd_user >/dev/null || \ %_sbindir/useradd -r -g %teamd_group -s /bin/false \ - -c "Teamd daemon user" -d %{_localstatedir}/lib/empty %teamd_user + -c "Teamd daemon user" -d %_localstatedir/lib/empty %teamd_user %_sbindir/usermod -g %teamd_group %teamd_user 2>/dev/null test -L %teamd_daemon_directory || rm -rf %teamd_daemon_directory && : %if 0%{?_unitdir:1} @@ -176,7 +177,7 @@ test -L %teamd_daemon_directory || rm -rf %teamd_daemon_directory && : %post tools # reload dbus to apply new teamd's policy -%{_bindir}/systemctl reload dbus.service 2>/dev/null || : +systemctl reload dbus.service 2>/dev/null || : %if 0%{?_unitdir:1} %service_add_post teamd@.service %endif @@ -192,7 +193,7 @@ test -L %teamd_daemon_directory || rm -rf %teamd_daemon_directory && : %endif # reload dbus to forget teamd's policy if [ ${FIRST_ARG:-$1} -eq 0 ]; then - %{_bindir}/systemctl reload dbus.service 2>/dev/null || : + systemctl reload dbus.service 2>/dev/null || : fi %post -n libteam5 -p /sbin/ldconfig @@ -207,7 +208,7 @@ fi %_libdir/libteamdctl.so.0* %files devel -%_includedir/pkg/ +%_includedir/* %_libdir/libteam.so %_libdir/libteamdctl.so %_libdir/pkgconfig/libteam*.pc