| |
@@ -43,9 +43,9 @@
|
| |
|
| |
Name: openvswitch
|
| |
Summary: Open vSwitch daemon/database/utilities
|
| |
- URL: http://www.openvswitch.org/
|
| |
+ URL: https://www.openvswitch.org/
|
| |
Version: 2.16.0
|
| |
- Release: 2%{?dist}
|
| |
+ Release: 3%{?dist}
|
| |
|
| |
# Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the
|
| |
# lib/sflow*.[ch] files are SISSL
|
| |
@@ -56,10 +56,11 @@
|
| |
%define dpdkarches aarch64 i686 ppc64le x86_64
|
| |
|
| |
%if 0%{?commit0:1}
|
| |
- Source: https://github.com/openvswitch/ovs/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
|
| |
+ Source0: https://github.com/openvswitch/ovs/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
|
| |
%else
|
| |
- Source: http://openvswitch.org/releases/%{name}-%{version}.tar.gz
|
| |
+ Source0: https://www.openvswitch.org/releases/%{name}-%{version}.tar.gz
|
| |
%endif
|
| |
+ Source1: openvswitch.sysusers
|
| |
|
| |
# ovs-patches
|
| |
|
| |
@@ -67,7 +68,8 @@
|
| |
|
| |
BuildRequires: gcc gcc-c++ make
|
| |
BuildRequires: autoconf automake libtool
|
| |
- BuildRequires: systemd-units openssl openssl-devel
|
| |
+ BuildRequires: systemd-rpm-macros
|
| |
+ BuildRequires: openssl openssl-devel
|
| |
BuildRequires: python3-devel python3-six python3-setuptools python3-sortedcontainers
|
| |
BuildRequires: python3-sphinx
|
| |
BuildRequires: desktop-file-utils
|
| |
@@ -105,13 +107,10 @@
|
| |
#Upstream kernel commit 4f647e0a3c37b8d5086214128614a136064110c3
|
| |
#Requires: kernel >= 3.15.0-0
|
| |
|
| |
- Requires(pre): shadow-utils
|
| |
+ %{?systemd_requires}
|
| |
+ %{?sysusers_requires_compat}
|
| |
+
|
| |
Requires(post): /bin/sed
|
| |
- Requires(post): /usr/sbin/usermod
|
| |
- Requires(post): /usr/sbin/groupadd
|
| |
- Requires(post): systemd-units
|
| |
- Requires(preun): systemd-units
|
| |
- Requires(postun): systemd-units
|
| |
Obsoletes: openvswitch-controller <= 0:2.1.0-1
|
| |
|
| |
%description
|
| |
@@ -223,6 +222,8 @@
|
| |
install -d -m 0750 $RPM_BUILD_ROOT%{_localstatedir}/log/openvswitch
|
| |
install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch
|
| |
|
| |
+ install -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysusersdir}/openvswitch.conf
|
| |
+
|
| |
install -p -D -m 0644 rhel/usr_lib_udev_rules.d_91-vfio.rules \
|
| |
$RPM_BUILD_ROOT%{_udevrulesdir}/91-vfio.rules
|
| |
|
| |
@@ -333,13 +334,7 @@
|
| |
%endif
|
| |
|
| |
%pre
|
| |
- getent group openvswitch >/dev/null || groupadd -r openvswitch
|
| |
- getent passwd openvswitch >/dev/null || \
|
| |
- useradd -r -g openvswitch -d / -s /sbin/nologin \
|
| |
- -c "Open vSwitch Daemons" openvswitch
|
| |
- getent group hugetlbfs >/dev/null || groupadd -r hugetlbfs
|
| |
- usermod -a -G hugetlbfs openvswitch
|
| |
- exit 0
|
| |
+ %sysusers_create_compat %{SOURCE1}
|
| |
|
| |
%post
|
| |
if [ $1 -eq 1 ]; then
|
| |
@@ -483,8 +478,13 @@
|
| |
%{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
|
| |
%{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
|
| |
%endif
|
| |
+ %{_sysusersdir}/openvswitch.conf
|
| |
|
| |
%changelog
|
| |
+ * Fri Mar 04 2022 Christian Glombek <lorbus@fedoraproject.org> - 2.16.0-3
|
| |
+ - Provide a sysusers.d file to get user() and group() provides
|
| |
+ (see https://fedoraproject.org/wiki/Changes/Adopting_sysusers.d_format).
|
| |
+
|
| |
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.16.0-2
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
| |
|
| |
lorbus
commented 2 years ago
(see https://fedoraproject.org/wiki/Changes/Adopting_sysusers.d_format).