pool/libteam
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 561779 from network

Browse Source 
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:
Dominique Leuenberger 2018-01-16 08:36:12 +00:00 committed by Git OBS Bridge
commit ed4cfc473a
2 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libteam.changes
View File

@ -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 Wed Nov 22 16:52:51 CET 2017 - ndas@suse.de
- allow send_interface in dbus conf file for wicked. - 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 Wed Nov 22 11:17:03 UTC 2017 - jengelh@inai.de

39
libteam.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libteam # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,6 +16,7 @@
# #
%bcond_without python2
Name: libteam Name: libteam
Version: 1.27 Version: 1.27
Release: 0 Release: 0
@ -27,11 +28,13 @@ Url: http://libteam.org/
#Git-Web: https://github.com/jpirko/libteam #Git-Web: https://github.com/jpirko/libteam
#Git-Clone: git://github.com/jpirko/libteam #Git-Clone: git://github.com/jpirko/libteam
Source: http://libteam.org/files/%name-%version.tar.gz 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: doxygen
BuildRequires: libcap-devel BuildRequires: libcap-devel
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: python-devel
BuildRequires: swig BuildRequires: swig
BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(jansson) 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-cli-3.0) >= 3.2.0
BuildRequires: pkgconfig(libnl-genl-3.0) >= 3.2.0 BuildRequires: pkgconfig(libnl-genl-3.0) >= 3.2.0
BuildRequires: pkgconfig(libnl-route-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 %if 0%{?suse_version} >= 1220
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
%endif %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_user teamd
%define teamd_group daemon %define teamd_group daemon
%define teamd_daemon_directory /run/teamd %define teamd_daemon_directory /run/teamd
@ -125,24 +127,28 @@ programs that will manipulate team network devices.
%patch3 -p1 %patch3 -p1
%build %build
%configure --includedir="%_includedir/pkg/%name" --bindir="%_sbindir" \ %configure --includedir="%_includedir/%name" --bindir="%_sbindir" \
--disable-silent-rules \
--disable-static \ --disable-static \
--with-run-dir=%teamd_daemon_directory \ --with-run-dir=%teamd_daemon_directory \
--with-user=%teamd_user \ --with-user=%teamd_user \
--with-group=%teamd_group --with-group=%teamd_group
# Use CFLAGS= to kill -Werror # Use CFLAGS= to kill -Werror
make %{?_smp_mflags} CFLAGS="%optflags" make %{?_smp_mflags} CFLAGS="%optflags"
%if %{with python2}
pushd binding/python/ pushd binding/python/
python ./setup.py build python ./setup.py build
popd popd
%endif
%install %install
b="%buildroot" b="%buildroot"
%make_install %make_install
%if %{with python2}
pushd binding/python/ pushd binding/python/
python ./setup.py install --root="$b" --prefix="%_prefix" python ./setup.py install --root="$b" --prefix="%_prefix"
popd popd
%endif
rm -f "$b/%_libdir"/*.la rm -f "$b/%_libdir"/*.la
%if 0%{?_unitdir:1} %if 0%{?_unitdir:1}
@ -162,7 +168,7 @@ make check
getent group daemon >/dev/null || %_sbindir/groupadd -r %teamd_group getent group daemon >/dev/null || %_sbindir/groupadd -r %teamd_group
getent passwd %teamd_user >/dev/null || \ getent passwd %teamd_user >/dev/null || \
%_sbindir/useradd -r -g %teamd_group -s /bin/false \ %_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 %_sbindir/usermod -g %teamd_group %teamd_user 2>/dev/null
test -L %teamd_daemon_directory || rm -rf %teamd_daemon_directory && : test -L %teamd_daemon_directory || rm -rf %teamd_daemon_directory && :
%if 0%{?_unitdir:1} %if 0%{?_unitdir:1}
@ -171,7 +177,7 @@ test -L %teamd_daemon_directory || rm -rf %teamd_daemon_directory && :
%post tools %post tools
# reload dbus to apply new teamd's policy # 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} %if 0%{?_unitdir:1}
%service_add_post teamd@.service %service_add_post teamd@.service
%endif %endif
@ -187,7 +193,7 @@ test -L %teamd_daemon_directory || rm -rf %teamd_daemon_directory && :
%endif %endif
# reload dbus to forget teamd's policy # reload dbus to forget teamd's policy
if [ ${FIRST_ARG:-$1} -eq 0 ]; then if [ ${FIRST_ARG:-$1} -eq 0 ]; then
/usr/bin/systemctl reload dbus.service 2>/dev/null || : systemctl reload dbus.service 2>/dev/null || :
fi fi
%post -n libteam5 -p /sbin/ldconfig %post -n libteam5 -p /sbin/ldconfig
@ -196,22 +202,18 @@ fi
%postun -n libteamdctl0 -p /sbin/ldconfig %postun -n libteamdctl0 -p /sbin/ldconfig
%files -n libteam5 %files -n libteam5
%defattr(-,root,root)
%_libdir/libteam.so.5* %_libdir/libteam.so.5*
%files -n libteamdctl0 %files -n libteamdctl0
%defattr(-,root,root)
%_libdir/libteamdctl.so.0* %_libdir/libteamdctl.so.0*
%files devel %files devel
%defattr(-,root,root) %_includedir/*
%_includedir/pkg/
%_libdir/libteam.so %_libdir/libteam.so
%_libdir/libteamdctl.so %_libdir/libteamdctl.so
%_libdir/pkgconfig/libteam*.pc %_libdir/pkgconfig/libteam*.pc
%files tools %files tools
%defattr(-,root,root)
%_sbindir/bond2team %_sbindir/bond2team
%_sbindir/team* %_sbindir/team*
%dir %_sysconfdir/dbus-1 %dir %_sysconfdir/dbus-1
@ -224,8 +226,9 @@ fi
%_unitdir %_unitdir
%endif %endif
%if %{with python2}
%files -n python-libteam %files -n python-libteam
%defattr(-,root,root)
%python_sitearch/* %python_sitearch/*
%endif
%changelog %changelog