From 33d1b35de01d25c4cfddeaa72cbdd1c6c90d638a Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Fri, 11 Nov 2022 04:38:13 +0800 Subject: [PATCH 1/2] update to nmstate-1.3.3-1.el8 Signed-off-by: anolis-bot --- ...ot-validate-on-non-desired-interface.patch | 78 ------------------- ...-clear-vlan-filtering-when-set-empty.patch | 60 -------------- ...m-bridge-Fix-multicast_router-option.patch | 72 ----------------- ...ov-Only-verify-SRIOV-VF-when-desired.patch | 31 -------- dist | 2 +- download | 6 +- nmstate.gpg | 78 +++++++++---------- nmstate.spec | 58 +++++++------- 8 files changed, 71 insertions(+), 314 deletions(-) delete mode 100644 BZ_2080528-ovs-Do-not-validate-on-non-desired-interface.patch delete mode 100644 BZ_2080530-python-bridge-clear-vlan-filtering-when-set-empty.patch delete mode 100644 BZ_2088373-nm-bridge-Fix-multicast_router-option.patch delete mode 100644 BZ_2108632-sriov-Only-verify-SRIOV-VF-when-desired.patch diff --git a/BZ_2080528-ovs-Do-not-validate-on-non-desired-interface.patch b/BZ_2080528-ovs-Do-not-validate-on-non-desired-interface.patch deleted file mode 100644 index 52046a7..0000000 --- a/BZ_2080528-ovs-Do-not-validate-on-non-desired-interface.patch +++ /dev/null @@ -1,78 +0,0 @@ -From c2aa72122d811180ae8c8f7f4fcb19a251024528 Mon Sep 17 00:00:00 2001 -From: Gris Ge -Date: Fri, 29 Apr 2022 14:25:53 +0800 -Subject: [PATCH] ovs: Do not validate on non-desired interface - -Currently nmstate is showing unmanaged ovs vxlan with empty parent which -failure the apply() even it is not mentioned in desire state. - -The fix is skip all the validations on non-desired interfaces. - -Integration test case included. - -Signed-off-by: Gris Ge ---- - libnmstate/ifaces/ifaces.py | 14 ++++++++++---- - tests/integration/ovs_test.py | 26 ++++++++++++++++++++++++++ - 2 files changed, 36 insertions(+), 4 deletions(-) - -diff --git a/libnmstate/ifaces/ifaces.py b/libnmstate/ifaces/ifaces.py -index c2a5d3c4..c2f9bfa9 100644 ---- a/libnmstate/ifaces/ifaces.py -+++ b/libnmstate/ifaces/ifaces.py -@@ -159,7 +159,8 @@ class Ifaces: - self._apply_copy_mac_from() - self.gen_metadata() - for iface in self.all_ifaces(): -- iface.pre_edit_validation_and_cleanup() -+ if iface.is_desired and iface.is_up: -+ iface.pre_edit_validation_and_cleanup() - - self._pre_edit_validation_and_cleanup() - -@@ -293,7 +294,11 @@ class Ifaces: - When OVS patch peer does not exist or is down, raise an error. - """ - for iface in self._kernel_ifaces.values(): -- if iface.type == InterfaceType.OVS_INTERFACE and iface.is_up: -+ if ( -+ iface.type == InterfaceType.OVS_INTERFACE -+ and iface.is_up -+ and iface.is_desired -+ ): - if iface.peer: - peer_iface = self._kernel_ifaces.get(iface.peer) - if not peer_iface or not peer_iface.is_up: -@@ -315,9 +320,9 @@ class Ifaces: - Validate that vlan is not being created over infiniband interface - """ - for iface in self._kernel_ifaces.values(): -- - if ( - iface.type in [InterfaceType.VLAN, InterfaceType.VXLAN] -+ and iface.is_desired - and iface.is_up - ): - if ( -@@ -338,9 +343,9 @@ class Ifaces: - If base MTU is not present, set same as vlan MTU - """ - for iface in self._kernel_ifaces.values(): -- - if ( - iface.type in [InterfaceType.VLAN, InterfaceType.VXLAN] -+ and iface.is_desired - and iface.is_up - and iface.mtu - ): -@@ -423,6 +428,7 @@ class Ifaces: - for ifname, iface in self._kernel_ifaces.items(): - if ( - iface.type == InterfaceType.VETH -+ and iface.is_desired - and iface.is_up - and not iface.peer - ): --- -2.35.1 - diff --git a/BZ_2080530-python-bridge-clear-vlan-filtering-when-set-empty.patch b/BZ_2080530-python-bridge-clear-vlan-filtering-when-set-empty.patch deleted file mode 100644 index 3fdb240..0000000 --- a/BZ_2080530-python-bridge-clear-vlan-filtering-when-set-empty.patch +++ /dev/null @@ -1,60 +0,0 @@ -From bc677dc4f356a89a9af5cf45e80d31afff44c6d7 Mon Sep 17 00:00:00 2001 -From: Fernando Fernandez Mancera -Date: Fri, 25 Mar 2022 13:27:16 +0100 -Subject: [PATCH] python, bridge: clear vlan filtering when set empty - -When the user specifies 'vlan: {}', Nmstate should clear the vlan -configuration for that port instead of merging it. - -Signed-off-by: Fernando Fernandez Mancera -(cherry picked from commit 8b87c7d533dfb568f9a1715d7b2c59c415c9470a) ---- - libnmstate/ifaces/linux_bridge.py | 23 +++++++++++++++++++++++ - 1 file changed, 23 insertions(+) - -diff --git a/libnmstate/ifaces/linux_bridge.py b/libnmstate/ifaces/linux_bridge.py -index ce331692..950e8c9e 100644 ---- a/libnmstate/ifaces/linux_bridge.py -+++ b/libnmstate/ifaces/linux_bridge.py -@@ -124,15 +124,38 @@ class LinuxBridgeIface(BridgeIface): - def gen_metadata(self, ifaces): - super().gen_metadata(ifaces) - if not self.is_absent: -+ original_ports_config = self.original_desire_dict.get( -+ LinuxBridge.CONFIG_SUBTREE, {} -+ ).get(LinuxBridge.PORT_SUBTREE, []) - for port_config in self.port_configs: - port_iface = ifaces.all_kernel_ifaces.get( - port_config[LinuxBridge.Port.NAME] - ) - if port_iface: -+ original_port = self._get_port_config( -+ original_ports_config, port_iface.name -+ ) -+ if ( -+ original_port -+ and original_port.get( -+ LinuxBridge.Port.VLAN_SUBTREE, None -+ ) -+ == {} -+ ): -+ port_config[ -+ LinuxBridge.Port.VLAN_SUBTREE -+ ] = original_port.get(LinuxBridge.Port.VLAN_SUBTREE) - port_iface.update( - {BridgeIface.BRPORT_OPTIONS_METADATA: port_config} - ) - -+ def _get_port_config(self, ports, port_name): -+ for port_config in ports: -+ if port_config[LinuxBridge.Port.NAME] == port_name: -+ return port_config -+ -+ return None -+ - def remove_port(self, port_name): - if self._bridge_config: - self.raw[LinuxBridge.CONFIG_SUBTREE][LinuxBridge.PORT_SUBTREE] = [ --- -2.35.1 - diff --git a/BZ_2088373-nm-bridge-Fix-multicast_router-option.patch b/BZ_2088373-nm-bridge-Fix-multicast_router-option.patch deleted file mode 100644 index aca4620..0000000 --- a/BZ_2088373-nm-bridge-Fix-multicast_router-option.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 81d78014be4b985c8f86159d7abed6a9f73b128c Mon Sep 17 00:00:00 2001 -From: Gris Ge -Date: Thu, 28 Apr 2022 21:20:26 +0800 -Subject: [PATCH] nm bridge: Fix multicast_router option - -Adding the missing support of multicast_router option of linux bridge -with these values: - * 0: disabled - * 1: auto - * 2: enabled - -Integration test case included and marked as tier 1 as oVirt requested -this. - -Signed-off-by: Gris Ge ---- - libnmstate/nm/bridge.py | 20 ++++++++++++++++++++ - tests/integration/linux_bridge_test.py | 22 ++++++++++++++++++++++ - 2 files changed, 42 insertions(+) - -diff --git a/libnmstate/nm/bridge.py b/libnmstate/nm/bridge.py -index e7d28e2b..4241c926 100644 ---- a/libnmstate/nm/bridge.py -+++ b/libnmstate/nm/bridge.py -@@ -17,6 +17,7 @@ - # along with this program. If not, see . - # - -+from libnmstate.error import NmstateNotImplementedError - from libnmstate.schema import LinuxBridge as LB - - from .bridge_port_vlan import nmstate_port_vlan_to_nm -@@ -42,6 +43,12 @@ NM_BRIDGE_OPTIONS_MAP = { - OPT.MULTICAST_STARTUP_QUERY_INTERVAL: "multicast_startup_query_interval", - } - -+NM_BRIDGE_MCAST_ROUTER_VALUE_MAP = { -+ 0: "disabled", -+ 1: "auto", -+ 2: "enabled", -+} -+ - - def create_setting( - bridge_state, base_con_profile, original_desired_iface_state -@@ -80,6 +87,8 @@ def _set_bridge_properties(bridge_setting, options): - bridge_setting.props.multicast_snooping = val - elif key == LB.STP_SUBTREE: - _set_bridge_stp_properties(bridge_setting, val) -+ elif key == LB.Options.MULTICAST_ROUTER: -+ _set_bridge_mcast_router(bridge_setting, val) - elif key in NM_BRIDGE_OPTIONS_MAP: - nm_prop_name = NM_BRIDGE_OPTIONS_MAP[key] - # NM is using the sysfs name -@@ -138,3 +147,14 @@ def create_port_setting(options, base_con_profile): - - def get_port(nm_device): - return nm_device.get_slaves() -+ -+ -+def _set_bridge_mcast_router(bridge_setting, nmstate_value): -+ nm_value = NM_BRIDGE_MCAST_ROUTER_VALUE_MAP.get(nmstate_value) -+ if nm_value: -+ bridge_setting.props.multicast_router = nm_value -+ else: -+ raise NmstateNotImplementedError( -+ f"Unsupported value {nmstate_value} for " -+ "multicast_router bridge option" -+ ) --- -2.35.3 - diff --git a/BZ_2108632-sriov-Only-verify-SRIOV-VF-when-desired.patch b/BZ_2108632-sriov-Only-verify-SRIOV-VF-when-desired.patch deleted file mode 100644 index c703043..0000000 --- a/BZ_2108632-sriov-Only-verify-SRIOV-VF-when-desired.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e1297610307287960290b9a8e87c75acf2b74e6a Mon Sep 17 00:00:00 2001 -From: Gris Ge -Date: Sun, 3 Jul 2022 17:06:12 +0800 -Subject: [PATCH] sriov: Only verify SRIOV VF when desired - -Skip the verification on SR-IOV if desire state does not mentioned so. - -Unit test case included. - -Signed-off-by: Gris Ge ---- - libnmstate/ifaces/ethernet.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/libnmstate/ifaces/ethernet.py b/libnmstate/ifaces/ethernet.py -index 720deab7..f3a843c0 100644 ---- a/libnmstate/ifaces/ethernet.py -+++ b/libnmstate/ifaces/ethernet.py -@@ -152,6 +152,9 @@ def verify_sriov_vf(iface, cur_ifaces): - and (iface.is_desired or iface.is_changed) - and iface.type == InterfaceType.ETHERNET - and iface.sriov_total_vfs > 0 -+ and iface.original_desire_dict.get(Ethernet.CONFIG_SUBTREE, {}).get( -+ Ethernet.SRIOV_SUBTREE -+ ) - ): - return - cur_iface = cur_ifaces.get_iface(iface.name, iface.type) --- -2.31.1 - diff --git a/dist b/dist index 0ee7539..9c0e36e 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8_6 +an8 diff --git a/download b/download index ae90438..c6cfc3c 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ -ef852f7af25028b2bc5fc5884823cf41 nmstate-1.2.1.tar.gz -0d32fcd2f5d3f9f511ee4f593349d4fc nmstate-1.2.1.tar.gz.asc -db631299755b9c1618907e3459d31e3b nmstate-rust-vendor-1.2.1.tar.xz +73497641c2280b81f824fc98e52451ed nmstate-1.3.3.tar.gz +9f1639eef8e997b16ce64b86ca90e96f nmstate-1.3.3.tar.gz.asc +7e00f0d63fa489a40bfcaf21fa74cac2 nmstate-vendor-1.3.3.tar.xz diff --git a/nmstate.gpg b/nmstate.gpg index 1c4631f..1fb2d22 100644 --- a/nmstate.gpg +++ b/nmstate.gpg @@ -327,7 +327,7 @@ jXY3xoBTq94SsA== -----END PGP PUBLIC KEY BLOCK----- -----BEGIN PGP PUBLIC KEY BLOCK----- -xsFNBF6haTkBEAC7CAiPirCR/zQSYKNozitSZMrXQk1BLeG0LuWgLdOeT7R0WU7m +mQINBF6haTkBEAC7CAiPirCR/zQSYKNozitSZMrXQk1BLeG0LuWgLdOeT7R0WU7m 063HA8geCOTqAPn7jV+EWHvww7881IhX2g/CIKd/j+pEqDL6G/Mp5+AEj78FpHBJ RMPyl3I8gK183JJe/F5BhSowoO4Joll09McQ+3DL0pA7YabXYIRPGhbBNZfmK41f psNsEarcjJtJVsT+S7gh98EX9/F2fL71LKCpacPXdaJjYd1eVVXISe43w0z99CuD @@ -338,42 +338,42 @@ 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 -qvuXBO8wSn2p2qJiu3fconD4UQ/pBfQwDQ== -=seEJ +tDFGZXJuYW5kbyBGZXJuYW5kZXogTWFuY2VyYSA8ZmZtYW5jZXJhQHJpc2V1cC5u +ZXQ+iQJOBBMBCAA4AhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAFiEEfUQ+BAIN +yWGvqJXerIciWuEsPqMFAmClGGUACgkQrIciWuEsPqNhLxAAgNV/yzsx6u1pUhiZ +A+DGSKVpd0e592IrSwM3TF7awaNFXlrB//ps6G8SyVcxFT3je1FWs5fdZVgPq6Lh +TYch913D1mf/eERJm81+PVnahOd0zTI7x/+btcxOlpvGYhgOecAxklLhVzXLlSeo +kepX+UPS012V/wafDyNZWeq/5eiGrZMwTvRTvZgivQaDSp+AnlYYiIKPrAhL2HeS +z94NjtPUl/0XjFuu1b19LJwWmFfbbGNvPcVhmJGy3WV8o1NSkHYcJmbnmwjTixtT +TmIw9d2tl17yUrDwicBdnzbpSFEypJXhc6I/MyS3Y1kJoNjaozp1K94eoMaO07qK +G4olVimE8IJoGTBQ/02fHYX2ZtZDv5i1GW7oGcluaEErZ2ABy+LOsMjZ4zFcQlid +rXsNmOnrqGHPPU7YlQWtQrDZyY+ENLhLHeHCkd8YF5tUQau66thHXGX18DU5YZ0y +eTyLgJta0NbpBfoIPbvR4IR4KgxSvvhllX397VwVydn17ny+TdZ34bWT9WG6BqUt +Zd/F5sjnqptYRTW01XdsaRkKApneayS4xqMqIy8IMGgrZfNdv1awm/7c+ovFd4Cf +reDdCdmWIcYfInLe3aqpEp+WRzYtkfkdwxnTVe4o6PD7zoJp7cK1VLiZrixGf4Ja +eGClqAH96DBPQ4AzyS0qIETETwm5Ag0EXqFpOQEQAJ++bjajjD5BPz9YLyB5Jzfn +nuL6B82sRyiDHTyhMuCnxDoP4nyMvwtexjR5r+p3QfWAnhMcBNcdmwR1E7eNtp4+ +FR6SeuNLCODbGq1z5n/WW85HkgewH87jp63r9YytEZUfkxhR3Bab+FnQ1rBgxwvV +ZNV1wgRbW59HLQeoks/bEf/K3kUuy8OlMiaSAxQqedyK595A/SJJS+Fq84Xd+RV5 +84DMH1Yg/NmawFJqqTk/ub0ALDpwBwBAjyXlbr1eiNLgFB4nI5htwN4GiY6jsej4 +Y0G8IJCjlZlfBLo1hVi/7FXfRpmT6DHbAdQcCHCJzzwMtCKKZtnuD8FwqNPA3gRp +L9ce5S6Ni/ZmLXiIx5Mz4+OYyOSYGlr275gK0M7ft2X+vW//9QKnFQM5fB9aZpX8 ++x2lR0Nrs8xFbsipLPRYw0e5VnqgaPIZAX0/CYfVz3Y0f87Y0nbsQkNkeJxxTWKn +hVbBgB5E9eBtD2BmkFNMZB7E8ekWm8aSZfhct9Sl3vaQgLinA/xa2fSMGLh/FmZ8 +xjmF/4KRlo5u7c6llAw2I2M/6YFoH9oitinkvvqEfibWj2yDss5RR0Xvq00oM99f +RLvX2V0tM9lJFE/n+OPwa6Csu+3VJK4p4o5voUkISpjFSWUohk6oFGIAyop/risj +mB6DqS+m4OOl1aHDSe3vABEBAAGJAjwEGAEIACYCGwwWIQR9RD4EAg3JYa+old6s +hyJa4Sw+owUCYKUYKgUJBcYV8QAKCRCshyJa4Sw+oyuiEACddfctezRCMJe81H97 +zL1XUhpnx6wIt3amaA1RmNJ2WGm0sPGGLIIUB8vvCcmbjwhjPnbY6NS36oFFiT3c +KNUqZzHgpzCSTiT3h5C85tTwbJSmT7VHkDnaJxFgDgzKN9+hrm0a4RKXcwGTCBda +w7ghxKADHiafYk4QEpLnq1qKAoBZBwnVMDR+YmMSiOpURPVdkleiZdJqa34Q5/cJ +xo7LjZ8kTn+4Cy49n0P9uucuubrZvRDHoFmkNKSmj1rdJ3EPUPQVvrj1zEI+bSGK +4psiwoqHJJgpDKS8VE/QKevBxOP+ohEEkNox86+xxsiXmC0c29pKitEFxRUpTZwm +vaMrAbidEnss36vPPfT94sl3xJ7P3Dx+1YPpTCDixtrS4LbB7Y3MlBHJ+M0H+ieP +l2bM49AhMeSC1sM/dXvj4sRtq1uvLtSYxn5sQOH+AwPnjpuJc0NfSy2YzFbqHH2S +Mr9WbtpoAYmakxSAYBZbbLHLJJbzoMgGu80zPWTlGGb5bynBX+cCYtmfSNyi4A3g +uzBMpwwjDo0QrctOximoGtZg3FpNnXTD/rdSMyI3MvDDcfwfzhCZ8wGrzBEt5rTx +MBkbkLecOhf7gtixX7VCUjnsoETVET2m58yhUwMj4tUWFWDVW8KvkP2XElJq5w/D +csTb0SbXvm1NLekrf4n2+3hPtg== +=UYso -----END PGP PUBLIC KEY BLOCK----- diff --git a/nmstate.spec b/nmstate.spec index 285f08e..64e4c0c 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -1,23 +1,17 @@ -%define anolis_release .0.1 - %?python_enable_dependency_generator %define srcname nmstate %define libname libnmstate Name: nmstate -Version: 1.2.1 -Release: 4%{anolis_release}%{?dist} +Version: 1.3.3 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc Source2: https://www.nmstate.io/nmstate.gpg -Source3: nmstate-rust-vendor-%{version}.tar.xz -Patch0: BZ_2080530-python-bridge-clear-vlan-filtering-when-set-empty.patch -Patch1: BZ_2080528-ovs-Do-not-validate-on-non-desired-interface.patch -Patch2: BZ_2088373-nm-bridge-Fix-multicast_router-option.patch -Patch3: BZ_2108632-sriov-Only-verify-SRIOV-VF-when-desired.patch +Source3: %{url}/releases/download/v%{version}/%{srcname}-vendor-%{version}.tar.xz BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: gnupg2 @@ -79,14 +73,6 @@ This package contains the Python 3 library for nmstate. %description -n nmstate-plugin-ovsdb This package contains the nmstate plugin for OVS database manipulation. -%package doc -Summary: Documents for %{name} -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -BuildArch: noarch - -%description doc -Doc pages for %{name}. - %prep gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgkey-mantainers.gpg gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} @@ -116,10 +102,14 @@ popd %install %py3_install pushd rust -env SKIP_PYTHON_INSTALL=1 PREFIX=%{_prefix} LIBDIR=%{_libdir} %make_install +env SKIP_PYTHON_INSTALL=1 \ + PREFIX=%{_prefix} \ + LIBDIR=%{_libdir} \ + %make_install popd %files +%doc README.md %doc examples/ %{_mandir}/man8/nmstatectl.8* %{_mandir}/man8/nmstate-autoconf.8* @@ -128,9 +118,6 @@ popd %{_bindir}/nmstatectl-rust %{_bindir}/nmstate-autoconf -%files doc -%doc README.md - %files -n python3-%{libname} %license LICENSE %{python3_sitelib}/%{libname} @@ -159,18 +146,29 @@ popd /sbin/ldconfig %changelog -* Wed Sep 14 2022 DengXiewei - 1.2.1-4.0.1 -- Add doc sub package +* Mon Aug 15 2022 Gris Ge - 1.3.3-1 +- Upgrade to nmstate-1.3.3 + +* Tue Aug 02 2022 Fernando Fernandez Mancera - 1.3.2-1 +- Upgrade to nmstate-1.3.2 + +* Wed Jul 20 2022 Fernando Fernandez Mancera - 1.3.1-1 +- Upgrade to nmstate-1.3.1 + +* Fri Jul 01 2022 Fernando Fernandez Mancera - 1.3.1-0.alpha.20220701 +- Upgrade to nmstate-1.3.1-0.alpha.20220701 + +* Mon Jun 13 2022 Fernando Fernandez Mancera - 1.3.0-1 +- Upgrade to nmstate-1.3.0-1 -* Thu Jul 14 2022 Gris Ge - 1.2.1-4 -- Skip verification on SRIOV if not desired. RHBZ#2108632 +* Thu May 05 2022 Fernando Fernandez Mancera - 1.3.0-0.alpha.20220505 +- Upgrade to nmstate-1.3.0.alpha.20220505 -* Tue May 24 2022 Fernando Fernandez Mancera - 1.2.1-3 -- Fix disable multicast-router for linux bridge. RHBZ#2088373 +* Thu Apr 07 2022 Fernando Fernandez Mancera - 1.3.0-0.alpha.20220407 +- Upgrade to nmstate-1.3.0.alpha.20220407 -* Wed May 04 2022 Fernando Fernandez Mancera - 1.2.1-2 -- Fix ovs vxlan base-iface error. RHBZ#2080528 -- Fix clear linux bridge vlan filtering. RHBZ#2080530 +* Thu Mar 10 2022 Gris Ge - 1.3.0-0.alpha.20220310 +Upgrade to nmstate-1.3.0-0.alpha.20220310 * Mon Feb 14 2022 Gris Ge - 1.2.1-1 - Upgrade to 1.2.1. RHBZ#1996618 -- Gitee From 5743bc75d2860dc9a607258b19fc608db34423f3 Mon Sep 17 00:00:00 2001 From: DengXiewei Date: Wed, 20 Jul 2022 11:56:53 +0800 Subject: [PATCH 2/2] Add doc sub package Signed-off-by: DengXiewei --- nmstate.spec | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/nmstate.spec b/nmstate.spec index 64e4c0c..d0c9d19 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -1,10 +1,12 @@ +%define anolis_release .0.1 + %?python_enable_dependency_generator %define srcname nmstate %define libname libnmstate Name: nmstate Version: 1.3.3 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -73,6 +75,14 @@ This package contains the Python 3 library for nmstate. %description -n nmstate-plugin-ovsdb This package contains the nmstate plugin for OVS database manipulation. +%package doc +Summary: Documents for %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +BuildArch: noarch + +%description doc +Doc pages for %{name}. + %prep gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgkey-mantainers.gpg gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} @@ -109,7 +119,6 @@ env SKIP_PYTHON_INSTALL=1 \ popd %files -%doc README.md %doc examples/ %{_mandir}/man8/nmstatectl.8* %{_mandir}/man8/nmstate-autoconf.8* @@ -118,6 +127,9 @@ popd %{_bindir}/nmstatectl-rust %{_bindir}/nmstate-autoconf +%files doc +%doc README.md + %files -n python3-%{libname} %license LICENSE %{python3_sitelib}/%{libname} @@ -146,6 +158,9 @@ popd /sbin/ldconfig %changelog +* Fri Nov 18 2022 DengXiewei - 1.3.3-1.0.1 +- Add doc sub package + * Mon Aug 15 2022 Gris Ge - 1.3.3-1 - Upgrade to nmstate-1.3.3 -- Gitee