jengelh/libteam
SHA256
1
0
Fork 0
forked from pool/libteam
Code Pull Requests Activity

- Drop /pkg/ subpart from includedir

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network/libteam?expand=0&rev=16
This commit is contained in:
Jan Engelhardt 2018-01-05 00:34:33 +00:00 committed by Git OBS Bridge
parent cfb90f4d8c
commit 65e2ff8c8c
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libteam.changes
View File

@ -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

25
libteam.spec
View File

@ -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