Accepting request 561779 from network
OBS-URL: https://build.opensuse.org/request/show/561779 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libteam?expand=0&rev=17
This commit is contained in:
commit
ed4cfc473a
@ -1,8 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- 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]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 22 11:17:03 UTC 2017 - jengelh@inai.de
|
||||
|
||||
|
39
libteam.spec
39
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,7 @@
|
||||
#
|
||||
|
||||
|
||||
%bcond_without python2
|
||||
Name: libteam
|
||||
Version: 1.27
|
||||
Release: 0
|
||||
@ -27,11 +28,13 @@ 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: swig
|
||||
BuildRequires: pkgconfig(dbus-1)
|
||||
BuildRequires: pkgconfig(jansson)
|
||||
@ -40,13 +43,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
|
||||
@ -125,24 +127,28 @@ 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 \
|
||||
--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"
|
||||
%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}
|
||||
@ -162,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}
|
||||
@ -171,7 +177,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 || :
|
||||
systemctl reload dbus.service 2>/dev/null || :
|
||||
%if 0%{?_unitdir:1}
|
||||
%service_add_post teamd@.service
|
||||
%endif
|
||||
@ -187,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
|
||||
/usr/bin/systemctl reload dbus.service 2>/dev/null || :
|
||||
systemctl reload dbus.service 2>/dev/null || :
|
||||
fi
|
||||
|
||||
%post -n libteam5 -p /sbin/ldconfig
|
||||
@ -196,22 +202,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/
|
||||
%_includedir/*
|
||||
%_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 +226,9 @@ fi
|
||||
%_unitdir
|
||||
%endif
|
||||
|
||||
%if %{with python2}
|
||||
%files -n python-libteam
|
||||
%defattr(-,root,root)
|
||||
%python_sitearch/*
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
Loading…
Reference in New Issue
Block a user