9 changed files with 363 additions and 696 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/nmstate-1.4.6.tar.gz
-SOURCES/nmstate-vendor-1.4.6.tar.xz
+SOURCES/nmstate-2.2.35.tar.gz
+SOURCES/nmstate-vendor-2.2.35.tar.xz
--- a/.nmstate.metadata
+++ b/.nmstate.metadata
@ -1,2 +1,2 @@
-2c5d46ae03fe2d836e165aa3562f03386d215fdf SOURCES/nmstate-1.4.6.tar.gz
-4735ef08c31684624a7844832cc2ba20e67983f6 SOURCES/nmstate-vendor-1.4.6.tar.xz
+4a79e45ce04fd38378cbd4352ac82ff2faee0c74 SOURCES/nmstate-2.2.35.tar.gz
+b852e7200d939dea56a9654b082915d7338d363b SOURCES/nmstate-vendor-2.2.35.tar.xz
--- a/SOURCES/0001-clib-Use-build.rs-to-fix-SONAME.patch
+++ b/SOURCES/0001-clib-Use-build.rs-to-fix-SONAME.patch
@ -1,60 +0,0 @@
-From 0b530d4c8e75f60015d13c225b1c634389fbe798 Mon Sep 17 00:00:00 2001
-From: Gris Ge <fge@redhat.com>
-Date: Fri, 17 May 2024 13:12:14 +0800
-Subject: [PATCH] clib: Use build.rs to fix SONAME
-
-Use [`cargo:rustc-cdylib-link-arg`][1] to `build.rs` to fix the SONAME issue
-of cargo.
-
-Removed workarounds in rpm spec and `.cargo/config.toml`.
-
-Changed Makefile to place `-lnmstate` after the source file to fix
-compile issue on ubuntu 20.04 old gcc.
-
-[1]: https://doc.rust-lang.org/cargo/reference/build-scripts.html#rustc-cdylib-link-arg
-
-Signed-off-by: Gris Ge <fge@redhat.com>
---
- rust/.cargo/config.toml  | 3 ---
- rust/src/clib/Cargo.toml | 1 +
- rust/src/clib/build.rs   | 6 ++++++
- 3 files changed, 7 insertions(+), 3 deletions(-)
- create mode 100644 rust/src/clib/build.rs
-
-diff --git a/rust/.cargo/config.toml b/rust/.cargo/config.toml
-index 018e59d4..ca6c72f7 100644
--- a/rust/.cargo/config.toml
-+++ b/rust/.cargo/config.toml
-@@ -1,5 +1,2 @@
-[build]
-rustflags = "-Clink-arg=-Wl,-soname=libnmstate.so.1"
-
- [target.x86_64-unknown-linux-gnu]
- runner = 'sudo -E'
-diff --git a/rust/src/clib/Cargo.toml b/rust/src/clib/Cargo.toml
-index 462757ca..0eb00922 100644
--- a/rust/src/clib/Cargo.toml
-+++ b/rust/src/clib/Cargo.toml
-@@ -6,6 +6,7 @@ authors = ["Gris Ge <fge@redhat.com>"]
- license = "Apache-2.0"
- edition = "2018"
- rust-version = "1.58"
-+build = "build.rs"
- 
- [lib]
- name = "nmstate"
-diff --git a/rust/src/clib/build.rs b/rust/src/clib/build.rs
-new file mode 100644
-index 00000000..74ad7e48
--- /dev/null
-+++ b/rust/src/clib/build.rs
-@@ -0,0 +1,6 @@
-+// SPDX-License-Identifier: Apache-2.0
-+
-+fn main() {
-+    #[cfg(target_os = "linux")]
-+    println!("cargo:rustc-cdylib-link-arg=-Wl,-soname=libnmstate.so.1");
-+}
-- 
-2.45.1
-
--- a/SOURCES/BZ_2132570-nm-reverse-IPv6-order-before-adding-them-to-setting.patch
+++ b/SOURCES/BZ_2132570-nm-reverse-IPv6-order-before-adding-them-to-setting.patch
@ -1,31 +0,0 @@
-From 248cd0bff6e3d030ee72b62a8a8b0e37e9f2ef80 Mon Sep 17 00:00:00 2001
-From: Fernando Fernandez Mancera <ffmancera@riseup.net>
-Date: Tue, 29 Nov 2022 23:56:13 +0100
-Subject: [PATCH] nm: reverse IPv6 order before adding them to setting
-
-This is a downstream patch that needs to be applied before any other
-patch. Please check:
-
-https://github.com/nmstate/nmstate/commit/2d0cfd5ad8e049f30cad10d977a5fae8bc4e6b64
-
-Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
---
- libnmstate/nm/ipv6.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libnmstate/nm/ipv6.py b/libnmstate/nm/ipv6.py
-index 8e01fd70..7eb3196c 100644
--- a/libnmstate/nm/ipv6.py
-+++ b/libnmstate/nm/ipv6.py
-@@ -157,7 +157,7 @@ def _set_dynamic(setting_ip, is_dhcp, is_autoconf):
- 
- 
- def _set_static(setting_ip, ip_addresses):
-    for address in ip_addresses:
-+    for address in reversed(ip_addresses):
-         if iplib.is_ipv6_link_local_addr(
-             address[InterfaceIPv6.ADDRESS_IP],
-             address[InterfaceIPv6.ADDRESS_PREFIX_LENGTH],
-- 
-2.38.1
-
--- a/SOURCES/RHEL-31095-do-not-clear-iface-dns-when-not-desired.patch
+++ b/SOURCES/RHEL-31095-do-not-clear-iface-dns-when-not-desired.patch
@ -1,184 +0,0 @@
-From daf5e4e2282312a80ade85ac5728babf8b9af8b5 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Mon, 17 Jun 2024 19:25:07 +0200
-Subject: [PATCH] nm: don't clear connection DNS if global DNS is not specified
-
-If the global DNS state is not specified, let's not overwrite it in
-Networkmanager profiles while doing unrelated changes.
-
-This is consistent with mainline (Rust) version of nmstate.
-
-Resolves: https://issues.redhat.com/browse/RHEL-31095
-Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
-Signed-off-by: Gris Ge <fge@redhat.com>
---
- libnmstate/dns.py           |  2 +-
- libnmstate/nm/connection.py | 10 +++++++---
- libnmstate/nm/ipv4.py       | 11 ++++++-----
- libnmstate/nm/ipv6.py       | 11 ++++++-----
- libnmstate/nm/profile.py    |  8 +++++---
- libnmstate/nm/profiles.py   |  7 ++++++-
- 6 files changed, 31 insertions(+), 18 deletions(-)
-
-diff --git a/libnmstate/dns.py b/libnmstate/dns.py
-index 5bb512e8..f50b9bfd 100644
--- a/libnmstate/dns.py
-+++ b/libnmstate/dns.py
-@@ -51,7 +51,7 @@ class DnsState:
-         self._config_changed = False
-         self._cur_dns_state = deepcopy(cur_dns_state) if cur_dns_state else {}
-         self._dns_state = merge_dns(des_dns_state, cur_dns_state or {})
-        if self._dns_state == REMOVE_DNS_CONFIG:
-+        if des_dns_state is not None and self._dns_state == REMOVE_DNS_CONFIG:
-             self._config_changed = True
-         elif des_dns_state and des_dns_state.get(DNS.CONFIG):
-             if cur_dns_state:
-diff --git a/libnmstate/nm/connection.py b/libnmstate/nm/connection.py
-index 6448e372..a6aac82c 100644
--- a/libnmstate/nm/connection.py
-+++ b/libnmstate/nm/connection.py
-@@ -104,11 +104,15 @@ class _ConnectionSetting:
-         return self._setting
- 
- 
-def create_new_nm_simple_conn(iface, nm_profile):
-+def create_new_nm_simple_conn(iface, nm_profile, clear_dns=False):
-     nm_iface_type = Api2Nm.get_iface_type(iface.type)
-     iface_info = iface.to_dict()
-    ipv4_set = create_ipv4_setting(iface_info.get(Interface.IPV4), nm_profile)
-    ipv6_set = create_ipv6_setting(iface_info.get(Interface.IPV6), nm_profile)
-+    ipv4_set = create_ipv4_setting(
-+        iface_info.get(Interface.IPV4), nm_profile, clear_dns
-+    )
-+    ipv6_set = create_ipv6_setting(
-+        iface_info.get(Interface.IPV6), nm_profile, clear_dns
-+    )
-     set_wait_ip(ipv4_set, ipv6_set, iface_info.get(Interface.WAIT_IP))
-     settings = [ipv4_set, ipv6_set]
-     con_setting = _ConnectionSetting()
-diff --git a/libnmstate/nm/ipv4.py b/libnmstate/nm/ipv4.py
-index 32b3428e..3f4de059 100644
--- a/libnmstate/nm/ipv4.py
-+++ b/libnmstate/nm/ipv4.py
-@@ -13,7 +13,7 @@ from .common import NM
- INT32_MAX = 2**31 - 1
- 
- 
-def create_setting(config, base_con_profile):
-+def create_setting(config, base_con_profile, clear_dns=True):
-     setting_ipv4 = None
-     if base_con_profile and config and config.get(InterfaceIPv4.ENABLED):
-         setting_ipv4 = base_con_profile.get_setting_ip4_config()
-@@ -28,10 +28,11 @@ def create_setting(config, base_con_profile):
-             setting_ipv4.props.route_metric = Route.USE_DEFAULT_METRIC
-             setting_ipv4.clear_routes()
-             setting_ipv4.clear_routing_rules()
-            setting_ipv4.clear_dns()
-            setting_ipv4.clear_dns_searches()
-            setting_ipv4.clear_dns_options(False)
-            setting_ipv4.props.dns_priority = nm_dns.DEFAULT_DNS_PRIORITY
-+            if clear_dns:
-+                setting_ipv4.clear_dns()
-+                setting_ipv4.clear_dns_searches()
-+                setting_ipv4.clear_dns_options(False)
-+                setting_ipv4.props.dns_priority = nm_dns.DEFAULT_DNS_PRIORITY
- 
-     if not setting_ipv4:
-         setting_ipv4 = NM.SettingIP4Config.new()
-diff --git a/libnmstate/nm/ipv6.py b/libnmstate/nm/ipv6.py
-index f84d895c..fb3cdcf0 100644
--- a/libnmstate/nm/ipv6.py
-+++ b/libnmstate/nm/ipv6.py
-@@ -67,7 +67,7 @@ def get_info(active_connection, applied_config):
-     return info
- 
- 
-def create_setting(config, base_con_profile):
-+def create_setting(config, base_con_profile, clear_dns=True):
-     setting_ip = None
-     if base_con_profile and config and config.get(InterfaceIPv6.ENABLED):
-         setting_ip = base_con_profile.get_setting_ip6_config()
-@@ -82,10 +82,11 @@ def create_setting(config, base_con_profile):
-             setting_ip.props.gateway = None
-             setting_ip.props.route_table = Route.USE_DEFAULT_ROUTE_TABLE
-             setting_ip.props.route_metric = Route.USE_DEFAULT_METRIC
-            setting_ip.clear_dns()
-            setting_ip.clear_dns_searches()
-            setting_ip.clear_dns_options(False)
-            setting_ip.props.dns_priority = nm_dns.DEFAULT_DNS_PRIORITY
-+            if clear_dns:
-+                setting_ip.clear_dns()
-+                setting_ip.clear_dns_searches()
-+                setting_ip.clear_dns_options(False)
-+                setting_ip.props.dns_priority = nm_dns.DEFAULT_DNS_PRIORITY
- 
-     if not setting_ip:
-         setting_ip = NM.SettingIP6Config.new()
-diff --git a/libnmstate/nm/profile.py b/libnmstate/nm/profile.py
-index a0b1c8f8..acb849b6 100644
--- a/libnmstate/nm/profile.py
-+++ b/libnmstate/nm/profile.py
-@@ -273,7 +273,9 @@ class NmProfile:
-             self._iface.type == InterfaceType.ETHERNET and self._iface.is_peer
-         )
- 
-    def prepare_config(self, save_to_disk, gen_conf_mode=False):
-+    def prepare_config(
-+        self, save_to_disk, gen_conf_mode=False, clear_dns=True
-+    ):
-         if self._iface.is_absent or (
-             self._iface.is_down
-             and not gen_conf_mode
-@@ -307,7 +309,7 @@ class NmProfile:
-         #       of nmstate should provide full/merged configure.
-         if self._iface.is_changed or self._iface.is_desired:
-             self._nm_simple_conn = create_new_nm_simple_conn(
-                self._iface, self._nm_profile
-+                self._iface, self._nm_profile, clear_dns
-             )
-         elif self._nm_profile:
-             self._nm_simple_conn = NM.SimpleConnection.new_clone(
-@@ -316,7 +318,7 @@ class NmProfile:
-         else:
-             try:
-                 self._nm_simple_conn = create_new_nm_simple_conn(
-                    self._iface, self._nm_profile
-+                    self._iface, self._nm_profile, clear_dns
-                 )
-             # No error for undesired interface
-             except NmstateError:
-diff --git a/libnmstate/nm/profiles.py b/libnmstate/nm/profiles.py
-index e68efdf3..9ce21938 100644
--- a/libnmstate/nm/profiles.py
-+++ b/libnmstate/nm/profiles.py
-@@ -52,6 +52,7 @@ class NmProfiles:
- 
-     def apply_config(self, net_state, save_to_disk):
-         if net_state.dns.config_changed:
-+            clear_profile_dns = True
-             if net_state.use_global_dns:
-                 apply_global_dns(
-                     net_state.dns.config_servers,
-@@ -60,6 +61,8 @@ class NmProfiles:
-                 )
-             else:
-                 apply_global_dns([], [], [])
-+        else:
-+            clear_profile_dns = False
- 
-         self._prepare_state_for_profiles(net_state)
-         # The activation order on bridge/bond ports determins their controler's
-@@ -74,7 +77,9 @@ class NmProfiles:
- 
-         for profile in all_profiles:
-             profile.import_current()
-            profile.prepare_config(save_to_disk, gen_conf_mode=False)
-+            profile.prepare_config(
-+                save_to_disk, gen_conf_mode=False, clear_dns=clear_profile_dns
-+            )
-         _use_uuid_as_controller_and_parent(all_profiles)
- 
-         changed_ovs_bridges_and_ifaces = {}
-- 
-2.45.2
-
--- a/SOURCES/RHEL-44623-fix-global-dns.patch
+++ b/SOURCES/RHEL-44623-fix-global-dns.patch
@ -1,70 +0,0 @@
-From 364842c0c09f9799a2c48a1bc3ce4debb1a3ddc2 Mon Sep 17 00:00:00 2001
-From: Gris Ge <fge@redhat.com>
-Date: Tue, 18 Jun 2024 13:44:55 +0800
-Subject: [PATCH] dns: Do not touch iface DNS when apply identical DNS state
-
-When applying the same DNS only desire state again, nmstate incorrectly
-purged interface DNS.
-
-The root cause is we only set `self.use_global_dns` to True when
-DNS changed. The fix is set `self.use_global_dns` to True always unless
-iface DNS is required.
-
-Signed-off-by: Gris Ge <fge@redhat.com>
---
- libnmstate/net_state.py | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/libnmstate/net_state.py b/libnmstate/net_state.py
-index 7b208daa..fe6fc31d 100644
--- a/libnmstate/net_state.py
-+++ b/libnmstate/net_state.py
-@@ -32,7 +32,7 @@ class NetState:
-         gen_conf_mode=False,
-         ignored_dns_ifaces=None,
-     ):
-        self.use_global_dns = False
-+        self.use_global_dns = True
-         if current_state is None:
-             current_state = {}
-         self._ifaces = Ifaces(
-@@ -76,17 +76,17 @@ class NetState:
-                         "interface profile, using global DNS"
-                     )
-                     logging.warning(
-                        "Storing DNS to NetworkManager via global dns API, "
-                        "this will cause __all__ interface level DNS settings "
-                        "been ignored"
-+                        "Storing DNS to NetworkManager via global DNS "
-+                        "API, this will cause __all__ interface level "
-+                        "DNS settings been ignored"
-                     )
-                    self.use_global_dns = True
-             else:
-                 if self.dns.is_purge() or self._is_iface_dns_prefered():
-                     try:
-                         self._ifaces.gen_dns_metadata(
-                             self._dns, self._route, ignored_dns_ifaces
-                         )
-+                        self.use_global_dns = False
-                     except NmstateValueError as e:
-                         if (
-                             gen_conf_mode
-@@ -99,14 +99,12 @@ class NetState:
-                                 "API, this will cause __all__ interface level "
-                                 "DNS settings been ignored"
-                             )
-                            self.use_global_dns = True
-                 elif self.dns.config_changed:
-                     logging.warning(
-                         "Storing DNS to NetworkManager via global DNS "
-                         "API, this will cause __all__ interface level "
-                         "DNS settings been ignored"
-                     )
-                    self.use_global_dns = True
- 
-             self._ifaces.gen_route_metadata(self._route)
-             self._ifaces.gen_route_rule_metadata(self._route_rule, self._route)
-- 
-2.45.2
-
--- a/SOURCES/nmstate-1.4.6.tar.gz.asc
+++ b/SOURCES/nmstate-1.4.6.tar.gz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEESP1vrlFad7SENoIch4lWe4cVzrwFAmZFuTcACgkQh4lWe4cV
-zrx0Jg/9FaBh+ine42rKdD+vSITPnGMB2pNSgU8RMdb35fpypVE6Fx4zavvlN14r
-rqO+DA57n2NAQ0Cj+n1HOaCxzbfYG2hAX8NwuFN3iY/KadqUdjdPx9G8vEzZDOFu
-MCRZxUVIyrHBB9eoTLbhF6hd0XqWminHK43xaLZFBXZAe7DO9QEz+VxM77qsZaE5
-EhxASs2mUERvjuY61h9lJb41DOxGLZBM5950S9lDM8cE9ZOi7H/8Q/8fhBPdHh5T
-ubPZxsgEBQPEBPz6lE5g4Wcc8ggiCROEuUqRmOTpkb6smgFDsLtCBTakv1Z2U5Q0
-YKdnDBfw7T9EV3dhkHR/AHvrLDUZ/bTwe6vO0GQBaSLG/WhvcftzuiDKTcqpAVOm
-yUdxla1tinB0cDXohGb50VV9aHd9gFisoLGsPE7BJTqSKhCoQL2zToLHNaMnxNtz
-/fJTOyGq1bBtchjbXjaoQO8sa/cxrllWlBYVjaTH7vqwgActrznos/N1sASrMfTw
-H1VCKRgwurnomWoIbFNKxPnXNW0Lo31paWhW9wVD78J7Kf9xHrfYiOK2siYgSP7x
-nVMuMHZ/j9/EOgHZAPZN3Aod0LWK0/WNwTyFB4IQcLWLaBYVhqlFhShtPo8MeIsJ
-Wy7UQmGhtnP8Mt1DQTsfWCH8lQnWpIb84xHYXSEs+2e39GRDCq8=
-=lwjx
-----END PGP SIGNATURE-----
--- a/SOURCES/nmstate-2.2.35.tar.gz.asc
+++ b/SOURCES/nmstate-2.2.35.tar.gz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEESP1vrlFad7SENoIch4lWe4cVzrwFAmbGq3oACgkQh4lWe4cV
+zrzT6xAA3cDVUbuxwurEXtbKu6ijbZYBWS7/JA9j6LreFqUxPB02UjrivYwX8l5/
+qAsk0QmD6Hyfs2wmh+nSfxGDqYywgc4WunS19oQSZ4ZUF6GoK9r6JiqS1OzNRZpW
+dI3ylSvXoG8aVrEiBxwlqNcjk7ustKIufR8gImsL5bDEBv9HWBe1wiqxxUXe5hHw
+T7lKg9trfysqmrNDpbBhgN6OQ/G9OgIFjY0VO8Tbaq31GpaVVMLQyhGrRKgN6C6S
+YBSI6wmT8z8hfmChaPmdm9YkYG7CicGFCn6eq9fLyEEhrjieTSMaxF6Ok+0TEIyi
+P0q58XKX3P46NuQO+MnRcggJyrbZtGbLR5INxys+U2kC9N1SFlUL9UqyxH/3TkfQ
+9dwSPBlcYGwAZ2t5BpddfPyYTomvXKeP4037PKlntDmVuhuE4rMljZxnl1K1H/Ug
+vu9ZWev21e/x9w9bLw74ecIDnqOTJjvNaENb1zEyzWuWloagjMpJy8GwyU7zWJ14
+2KvGRSA9uOHMntYWCtTgM/eX0oVuiVQy6TLyFgAs6zHUEqrefkNyhxNfg2HgUVgu
+TvDSXC2p4p2GQOVWoG1pX/c4xHX4rL/O9HZhzNF4NfdhQfYarL1JK6KV9Ys5Rw7Z
+b5PXamR3iOCalPEWMuRF/igqfDT9NrLOOzkkLtbZZ/LMSTjxH5o=
+=Vo1b
+-----END PGP SIGNATURE-----
--- a/SPECS/nmstate.spec
+++ b/SPECS/nmstate.spec
@ -3,27 +3,21 @@
 %define libname libnmstate

 Name:           nmstate
-Version:        1.4.6
-Release:        4%{?dist}
+Version:        2.2.35
+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:        %{url}/releases/download/v%{version}/%{srcname}-vendor-%{version}.tar.xz
-# Patches 0X are reserved to downstream only
-Patch0:         BZ_2132570-nm-reverse-IPv6-order-before-adding-them-to-setting.patch
-Patch10:        0001-clib-Use-build.rs-to-fix-SONAME.patch
-Patch11:        RHEL-44623-fix-global-dns.patch
-Patch12:        RHEL-31095-do-not-clear-iface-dns-when-not-desired.patch
+Source0:        https://github.com/nmstate/nmstate/releases/download/v%{version}/nmstate-%{version}.tar.gz
+Source1:        https://github.com/nmstate/nmstate/releases/download/v%{version}/nmstate-%{version}.tar.gz.asc
+Source2:        https://nmstate.io/nmstate.gpg
+Source3:        https://github.com/nmstate/nmstate/releases/download/v%{version}/nmstate-vendor-%{version}.tar.xz
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  gnupg2
 BuildRequires:  rust-toolset
 BuildRequires:  pkg-config
-Requires:       python3-setuptools
-Requires:       python3-%{libname} = %{?epoch:%{epoch}:}%{version}-%{release}
+BuildRequires:  systemd

 %description
 Nmstate is a library with an accompanying command line tool that manages host
@ -32,10 +26,17 @@ needs to manage host networking through a northbound declarative API and multi
 provider support on the southbound.


+%package libs
+Summary:        C binding of nmstate
+# Use Recommends for NetworkManager because only access to NM DBus is required,
+# but NM could be running on a different host
+Recommends:     NetworkManager
+# Avoid automatically generated profiles
+Recommends:     NetworkManager-config-server
+License:        ASL 2.0
+
 %package -n python3-%{libname}
 Summary:        nmstate Python 3 API library
-BuildArch:      noarch
-Requires:       NetworkManager-libnm >= 1:1.26.0
 # Use Recommends for NetworkManager because only access to NM DBus is required,
 # but NM could be running on a different host
 Recommends:     NetworkManager
@ -45,38 +46,33 @@ Recommends:     NetworkManager-config-server
 # required for OVS and team support
 Suggests:       NetworkManager-ovs
 Suggests:       NetworkManager-team
-Requires:       nispor
-Requires:       python3dist(varlink)
-
-%package -n nmstate-plugin-ovsdb
-Summary:        nmstate plugin for OVS database manipulation
-BuildArch:      noarch
-Requires:       python3-%{libname} = %{?epoch:%{epoch}:}%{version}-%{release}
-# The python-openvswitch rpm pacakge is not in the same repo with nmstate,
-# hence state it as Recommends, no requires.
-Recommends:     python3dist(ovs)
-
-
-%package libs
-Summary:        C binding of nmstate
-License:        ASL 2.0
+# FIXME: Once upstream included nispor into requirement.txt, remove below line
+Provides:       nmstate-plugin-ovsdb = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Obsoletes:      nmstate-plugin-ovsdb < 2.1-1

 %package devel
 Summary:        C binding development files of nmstate
 License:        ASL 2.0
 Requires:       nmstate-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}

+%package static
+Summary:        Static development files for nmstate
+Group:          Development/Libraries
+Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
+
+%description static
+Static C library bindings for nmstate.
+
 %description libs
 This package contains the C binding of nmstate.

 %description devel
 This package contains the C binding development files of nmstate.

-%description -n python3-%{libname}
-This package contains the Python 3 library for nmstate.

-%description -n nmstate-plugin-ovsdb
-This package contains the nmstate plugin for OVS database manipulation.
+%description -n python3-%{libname}
+This package contains the Python 3 library for Nmstate.

 %prep
 gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgkey-mantainers.gpg
@ -86,46 +82,45 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0}
 pushd rust
 # Source3 is vendored dependencies
 %cargo_prep -V 3
+
 popd

 %build
+pushd rust/src/python
 %py3_build
-
+popd
 pushd rust
-# It is safe to ignore minimum rust version. The main blocker on MSRV is
-# toml which just increase their MSRV by a robot for no hard reason.
-%cargo_build --ignore-rust-version
+%cargo_build
 popd

 %install
-%py3_install
-pushd rust
 env SKIP_PYTHON_INSTALL=1 \
-   PREFIX=%{_prefix} \
-   LIBDIR=%{_libdir} \
-   %make_install
+    PREFIX=%{_prefix} \
+    LIBDIR=%{_libdir} \
+    SYSCONFDIR=%{_sysconfdir} \
+    %make_install
+
+pushd rust/src/python
+%py3_install
 popd

+
 %files
 %doc README.md
 %doc examples/
+%{_mandir}/man8/nmstate.service.8*
 %{_mandir}/man8/nmstatectl.8*
 %{_mandir}/man8/nmstate-autoconf.8*
-%{python3_sitelib}/nmstatectl
 %{_bindir}/nmstatectl
-%{_bindir}/nmstatectl-rust
 %{_bindir}/nmstate-autoconf
+%{_unitdir}/nmstate.service
+%dir %{_sysconfdir}/%{name}
+%{_sysconfdir}/%{name}/README

 %files -n python3-%{libname}
 %license LICENSE
 %{python3_sitelib}/%{libname}
 %{python3_sitelib}/%{srcname}-*.egg-info/
-%exclude %{python3_sitelib}/%{libname}/plugins/nmstate_plugin_*
-%exclude %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_*
-
-%files -n nmstate-plugin-ovsdb
-%{python3_sitelib}/%{libname}/plugins/nmstate_plugin_ovsdb*
-%{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb*

 %files libs
 %license rust/LICENSE
@ -137,6 +132,9 @@ popd
 %{_includedir}/nmstate.h
 %{_libdir}/pkgconfig/nmstate.pc

+%files static
+%{_libdir}/libnmstate.a
+
 %post libs
 /sbin/ldconfig

@ -144,388 +142,402 @@ popd
 /sbin/ldconfig

 %changelog
-* Sun Jul 14 2024 Gris Ge <fge@redhat.com> - 1.4.6-4
- Do not clear iface DNS if not desired. RHEL-31095
+* Thu Aug 22 2024 Gris Ge <fge@redhat.com> - 2.2.35-1
+- Upgrade to 2.2.35
+- Fix gen_diff on VLAN ID change. RHEL-38623
+- Fix Nmpolicy on mac-address identifier. RHEL-54292
+- Fix reapply. RHEL-50556

-* Wed Jun 26 2024 Gris Ge <fge@redhat.com> - 1.4.6-3
- Fix global DNS on second apply. RHEL-44623
+* Thu Jun 13 2024 Gris Ge <fge@redhat.com> - 2.2.33-1
+- Upgrade to 2.2.33
+- Fix validation of controller overbook. RHEL-40683
+- Support DNS and route in kernel mode. RHEL-37665

-* Fri May 17 2024 Gris Ge <fge@redhat.com> - 1.4.6-2
- Fix clib SONAME. RHEL-32218
+* Thu May 30 2024 Gris Ge <fge@redhat.com> - 2.2.32-1
+- Upgrade to 2.2.32
+- Set VLAN reorder-headers to true by default. RHEL-33362

-* Thu May 16 2024 Gris Ge <fge@redhat.com> - 1.4.6-1
- Do not touch interface DNS if global DNS is used. RHEL-32218
+* Mon May 20 2024 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.31-1
+- Upgrade to 2.2.31
+- Support IPSec leftsubnet property. RHEL-26755

-* Wed Nov 15 2023 Gris Ge <fge@redhat.com> - 1.4.5-2
- Fix use case on purging DNS option. RHEL-13936
+* Fri May 03 2024 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.30-1
+- Upgrade to 2.2.30

-* Thu Nov 02 2023 Gris Ge <fge@redhat.com> - 1.4.5-1
- Support DNS option. RHEL-13936
+* Thu Apr 25 2024 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.29-1
+- Upgrade to 2.2.29

-* Wed Oct 04 2023 Wen Liang <wenliang@redhat.com> - 1.4.4-5
- Support treating string as int for address prefix-length. RHEL-3358
+* Mon Apr 22 2024 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.28-1
+- Upgrade to 2.2.28

-* Wed Aug 30 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.4.4-4
- Fix issue with ovs-bridge and ovs-interface with same name. RHBZ#2231843
+* Thu Mar 21 2024 Gris Ge <fge@redhat.com> - 2.2.27-1
+### Breaking changes
+ - N/A

-* Tue May 30 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.4.4-3
- Support static route with auto-ip. RHBZ#2203277
+### New features
+ - Support TCP congestion window(cwnd) in route. (59f99632)
+ - Support query interface driver. (67817c23)
+ - New API to generate changed state. (fe5327a2)

-* Mon Apr 24 2023 Gris Ge <fge@redhat.com> - 1.4.4-2
- Enable CI gating.
+### Bug fixes
+ - Include driver information for `persist-nic-names` subcommand. (1129e46b)
+ - nm: Protect global DNS config in checkpoint. (881373ba)
+ - route rule: Append rule instead of overriding when iface defined. (88d3d3ef)
+- Resolves RHEL-19409

-* Sun Apr 23 2023 Gris Ge <fge@redhat.com> - 1.4.4-1
- Upgrade to nmstate 1.4.4
+* Wed Mar 13 2024 Gris Ge <fge@redhat.com> - 2.2.26-1
+- Upgrade to 2.2.26

-* Wed Mar 29 2023 Gris Ge <fge@redhat.com> - 1.4.3-1
- Upgrade to nmstate 1.4.3. RHBZ#2179899
+* Thu Feb 22 2024 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.25-1
+- Upgrade to 2.2.25

-* Mon Feb 27 2023 Gris Ge <fge@redhat.com> - 1.4.2-4
- Ignore undesired iface config. RHBZ#2160416
+* Thu Feb 08 2024 Gris Ge <fge@redhat.com> - 2.2.24-1
+- Upgrade to 2.2.24

-* Thu Feb 23 2023 Gris Ge <fge@redhat.com> - 1.4.2-3
- Additional patch for SR-IOV. RHBZ#2160416
+* Thu Jan 18 2024 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.23-1
+- Upgrade to 2.2.23.

-* Wed Feb 22 2023 Gris Ge <fge@redhat.com> - 1.4.2-2
- Enable YAML API in rust clib.
+* Fri Jan 05 2024 Gris Ge <fge@redhat.com> - 2.2.22-1
+- Upgrade to 2.2.22.

-* Sat Feb 18 2023 Gris Ge <fge@redhat.com> - 1.4.2-1
- Upgrade to nmstate 1.4.2
+* Tue Dec 19 2023 Gris Ge <fge@redhat.com> - 2.2.21-2
+- Fix `ipsec-interface` option. RHEL-17403

-* Mon Jan 09 2023 Gris Ge <fge@redhat.com> - 1.4.1-1
- Upgrade to nmstate-1.4.1
+* Fri Dec 15 2023 Íñigo Huguet <ihuguet@redhat.com> - 2.2.21-1
+- Upgrade to 2.2.21.

-* Wed Dec 14 2022 Gris Ge <fge@redhat.com> - 1.4.0-1
- Upgrade to nmstate-1.4.0
+* Thu Nov 30 2023 Gris Ge <fge@redhat.com> - 2.2.20-1
+- Upgrade to 2.2.20.

-* Thu Dec 01 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.4.0.alpha.20221201
- Upgrade to nmstate-1.4.0.alpha.20221201
+* Wed Nov 15 2023 Gris Ge <fge@redhat.com> - 2.2.19-1
+- Upgrade to 2.2.19.

-* Fri Nov 18 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.3.4.alpha.20221118
- Upgrade to nmstate-1.3.4.alpha.20221118
+* Thu Nov 02 2023 Gris Ge <fge@redhat.com> - 2.2.18-1
+- Upgrade to 2.2.18.

-* Mon Oct 24 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.3.4.alpha.20221024
- Undo the branching misdone by Fernando.
+* Thu Sep 21 2023 Gris Ge <fge@redhat.com> - 2.2.16-1
+- Upgrade to 2.2.16.

-* Mon Aug 15 2022 Gris Ge <fge@redhat.com> - 1.3.3-1
- Upgrade to nmstate-1.3.3
+* Mon Sep 04 2023 Gris Ge <fge@redhat.com> - 2.2.15-3
+- Rebuild for RHEL 9.4.

-* Tue Aug 02 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.3.2-1
- Upgrade to nmstate-1.3.2
+* Wed Aug 30 2023 Gris Ge <fge@redhat.com> - 2.2.15-2
+- Rebuild for RHEL 9.3.

-* Wed Jul 20 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.3.1-1
- Upgrade to nmstate-1.3.1
+* Wed Aug 23 2023 Gris Ge <fge@redhat.com> - 2.2.15-1
+- Upgrade to 2.2.15

-* Fri Jul 01 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.3.1-0.alpha.20220701
- Upgrade to nmstate-1.3.1-0.alpha.20220701
+* Wed Jul 26 2023 Gris Ge <fge@redhat.com> - 2.2.14-1
+- Upgrade to 2.2.14

-* Mon Jun 13 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.3.0-1
- Upgrade to nmstate-1.3.0-1
+* Thu Jul 13 2023 Gris Ge <fge@redhat.com> - 2.2.13-1
+- Upgrade to 2.2.13

-* Thu May 05 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.3.0-0.alpha.20220505
- Upgrade to nmstate-1.3.0.alpha.20220505
+* Wed Jun 07 2023 Gris Ge <fge@redhat.com> - 2.2.12-2
+- Fix regression on SRIOV timeout. RHBZ#2212380

-* Thu Apr 07 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.3.0-0.alpha.20220407
- Upgrade to nmstate-1.3.0.alpha.20220407
+* Thu Jun 01 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.12-1
+- Upgrade to 2.2.12

-* Thu Mar 10 2022 Gris Ge <fge@redhat.com> - 1.3.0-0.alpha.20220310
-Upgrade to nmstate-1.3.0-0.alpha.20220310
+* Wed May 17 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.11-1
+- Upgrade to 2.2.11

-* Mon Feb 14 2022 Gris Ge <fge@redhat.com> - 1.2.1-1
- Upgrade to 1.2.1. RHBZ#1996618
+* Tue Apr 25 2023 Gris Ge <fge@redhat.com> - 2.2.10-3
+- Fix error when DHCP enabled with auto ip on STP bridge

-* Thu Jan 27 2022 Gris Ge <ferferna@redhat.com> - 1.2.1-0.2.alpha2
- Upgrade to 1.2.1 alpha2. RHBZ#1996618
+* Sun Apr 23 2023 Gris Ge <fge@redhat.com> - 2.2.10-2
+- Do not pin NIC if `net.ifnames=0`

-* Thu Jan 13 2022 Gris Ge <fge@redhat.com> - 1.2.1-0.1.alpha1
- Upgrade to 1.2.1 alpha1. RHBZ#1996618
+* Thu Mar 23 2023 Gris Ge <fge@redhat.com> - 2.2.9-1
+- Upgrade to 2.2.9

-* Thu Dec 16 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.2.0-1
- Upgrade to 1.2.0. RHBZ#1996618
+* Sun Mar 12 2023 Gris Ge <fge@redhat.com> - 2.2.8-1
+- Upgrade to 2.2.8

-* Thu Dec 09 2021 Gris Ge <fge@redhat.com> - 1.2.0-0.1.alpha2
- Upgrade to 1.2.0 alpha2. RHBZ#1996618
+* Fri Feb 17 2023 Gris Ge <fge@redhat.com> - 2.2.7-1
+- Upgrade to 2.2.7

-* Tue Oct 12 2021 Gris Ge <fge@redhat.com> - 1.2.0-0.1.alpha1
- Upgrade to 1.2.0 alpha1.
+* Thu Feb 09 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.6-1
+- Upgrade to 2.2.6

-* Wed Sep 15 2021 Ana Cabral <acabral@redhat.com> - 1.1.1-0.1.alpha1
- Upgrade to 1.1.1 alpha1.
- Canonicalize ipv6 addresses for dns nameservers. RHBZ#1911241
- Throw better error when peer is missing for veth interfaces. RHBZ#1973973
+* Thu Jan 26 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.5-1
+- Upgrade to 2.2.5

-* Tue Jul 27 2021 Gris Ge <fge@redhat.com> - 1.1.0-3
- Fix state=ignore for OVS interface. RHBZ#1944054
- Fix verification for next hop address 0.0.0.0. RHBZ#1985879
+* Thu Jan 19 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.4-1
+- Upgrade to 2.2.4

-* Fri Jul 23 2021 Gris Ge <fge@redhat.com> - 1.1.0-2
- Preserving existing ethtool settings. RHBZ#1984764
+* Wed Jan 11 2023 Gris Ge <fge@redhat.com> - 2.2.3-3
+- Fix OVSDB verification error

-* Thu Jul 15 2021 Gris Ge <fge@redhat.com> - 1.1.0-1
- Upgrade to 1.1.0.
+* Tue Jan 10 2023 Gris Ge <fge@redhat.com> - 2.2.3-2
+- Enable error message for rpm CI gating

-* Fri Jul 09 2021 Gris Ge <fge@redhat.com> - 1.1.0-0.7.alpha7
- Upgarde to 1.1.0 alpha7.
+* Mon Jan 09 2023 Gris Ge <fge@redhat.com> - 2.2.3-1
+- Upgrade to 2.2.3

-* Thu Jul 01 2021 Gris Ge <fge@redhat.com> - 1.1.0-0.6.alpha6
- Upgrade to 1.1.0 alpha6.
+* Thu Dec 15 2022 Gris Ge <fge@redhat.com> - 2.2.2-2
+- Fix regression on VRF interface.

-* Mon Jun 21 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.1.0-0.5.alpha4
- Upgrade to 1.1.0 alpha4.
+* Wed Dec 14 2022 Gris Ge <fge@redhat.com> - 2.2.2-1
+- Upgrade to 2.2.2

-* Wed Jun 16 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.1.0-0.4.alpha3
- Rebuild to introduce CI gating tier1 tests. RHBZ#1813357
+* Thu Dec 01 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.2-0.alpha.20221201.c8c776e9
+- Upgrade to 2.2.2-0.alpha.20221201.c8c776e9

-* Tue Jun 08 2021 Gris Ge <fge@redhat.com> - 1.1.0-0.3.alpha3
- Upgrade to 1.1.0 alpha3.
+* Wed Nov 16 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.1-1
+- Upgrade to 2.2.1

-* Mon Jun 07 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.1.0-0.2
- Upgrade to 1.1.0 alpha2.
+* Thu Nov 10 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.1-0.alpha.20221110.a9cee09d
+- Upgrade to 2.2.1-0.alpha.20221110.a9cee09d

-* Wed May 19 2021 Wen Liang <wenliang@redhat.com> - 1.1.0-0.1
- Upgrade to 1.1.0 alpha1.
+* Mon Oct 17 2022 Gris Ge <fge@redhat.com> - 2.2.0-1
+- Upgrade to 2.2.0

-* Tue Apr 20 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.0.3-1
- Upgrade to 1.0.3. RHBZ#1942458
+* Fri Oct 14 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.0-0.alpha.20221014.e54d9ae0
+- Upgrade to 2.2.0-alpha.20221014.e54d9ae0

-* Fri Mar 26 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.0.2-6
- Rebuild for RHEL 8.5. RHBZ#1935710
+* Mon Aug 15 2022 Gris Ge <fge@rehda.tcom> - 2.1.4-1
+- Upgrade to 2.1.4

-* Fri Mar 26 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.0.2-5
- New patch for fixing unmanaged interfaces being managed. RHBZ#1935710
+* Thu Jul 28 2022 Gris Ge <fge@redhat.com> - 2.1.3-1
+- Upgraded to 2.1.3

-* Tue Feb 23 2021 Gris Ge <fge@redhat.com> - 1.0.2-4
- New patch for SRIOV decrease VF amount. RHBZ#1931355
+* Wed Jul 20 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.1.3-20220720.cf972e4d
+- Upgrade to nmstate-2.1.3-20220720.cf972e4d

-* Tue Feb 23 2021 Gris Ge <fge@redhat.com> - 1.0.2-3
- Fix actiation failure when decrease VF mount on i40e. RHBZ#1931355
+* Thu Jul 14 2022 Gris Ge <fge@redhat.com> - 2.1.3-20220714.81d80992
+- Upgrade to nmstate-2.1.3-20220714.81d80992

-* Tue Feb 23 2021 Gris Ge <fge@redhat.com> - 1.0.2-2
- Fix nmstatectl return code of `set` command. RHBZ#1931751
+* Thu Jun 30 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.1.2-1
+- Upgrade to 2.1.2

-* Fri Feb 19 2021 Gris Ge <fge@redhat.com> - 1.0.2-1
- Upgrade to 1.0.2.
+* Mon Jun 13 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.1.1-1
+- Upgrade to 2.1.1

-* Wed Feb 10 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.0.2-0.3
- Fix sources name
+* Thu Jun 02 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.1.1-0.alpha.20220602.5accbd1
+- Upgrade to nmstate-2.1.1-0.alpha.20220602.5accbd1

-* Wed Feb 10 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.0.2-0.2
- Upgrade to 1.0.2 alpha 2
+* Thu May 19 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.1.1-0.alpha.20220519.437e4a9
+- Upgrade to nmstate-2.1.1-0.alpha.20220519.437e4a9

-* Tue Jan 26 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.0.2-0.1
- Upgrade to 1.0.2 alpha 1
+* Fri Apr 22 2022 Gris Ge <fge@redhat.com> - 2.1.0-1
+- Upgrade to 2.1.0
+
+* Tue Apr 19 2022 Gris Ge <fge@redhat.com> - 2.1.0-0.alpha.20220419.d613311d
+- Upgrade to nmstate-2.1.0-0.alpha.20220419.d613311d
+
+* Thu Apr 07 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.1.0-0.alpha.20220407
+- Upgrade to nmstate-2.1.0-0.alpha.20220407
+
+* Fri Mar 11 2022 Gris Ge <fge@redhat.com> - 2.1.0-0.alpha.20220311.6f7c2be
+- Upgrade to nmstate-2.1.0-0.alpha.20220311.6f7c2be
+
+* Thu Feb 24 2022 Gris Ge <fge@redhat.com> - 2.0.0-2
+- Force python3-libnmstate and nmstate-plugin-ovsdb as noarch. RHBZ#1996575
+
+* Wed Feb 16 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.0.0-1
+- Upgrade to 2.0.0. RHBZ#1996575
+
+* Thu Jan 13 2022 Gris Ge <fge@redhat.com> - 2.0.0-0.7.alpha6
+- Add gating.yaml. RHBZ#1996575
+
+* Wed Jan 12 2022 Gris Ge <fge@redhat.com> - 2.0.0-0.6.alpha6
+- Upgrade to 2.0.0. alpha 6. Resolves: RHBZ#1996575
+
+* Thu Dec 16 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.0.0-0.5.alpha5
+- Upgrade to 2.0.0 alpha 5. Resolves: RHBZ#1996575
+- Fix release number.
+
+* Thu Dec 09 2021 Gris Ge <fge@redhat.com> - 2.0.0-0.1.alpha4
+- Upgrade to 2.0.0 alpha 4. Resolves: RHBZ#1996575
+
+* Thu Sep 23 2021 Ana Cabral <acabral@redhat.com> - 2.0.0-0.4.alpha3
+- Upgrade to 2.0.0 alpha 3. Resolves: RHBZ#1996575
+- Remove connection renaming behaviour. Resolves: RHBZ#1998222
+- Add prefixes to OVS bridges and interfaces connections. Resolves: RHBZ#1998218
+- Improve OVS bridge start with nmstate. Resolves: RHBZ#1660250
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.0-0.3.alpha2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Wed Jul 14 2021 Gris Ge <fge@redhat.com> - 2.0.0-0.2.alpha2
+- Upgrade to 2.0.0 alpha2
+
+* Fri Jul 02 2021 Wen Liang <wenliang@redhat.com> - 2.0.0-0.1
+- Upgrade to 2.0.0 alpha1
+
+* Fri Jun 18 2021 Wen Liang <wenliang@redhat.com> - 1.1.0-0.3
+- Fix the 'Release' error. Resolves: RHBZ#1962381
+
+* Thu Jun 10 2021 Wen Liang <wenliang@redhat.com> - 1.1.0-0.3
+- Upgrade to 1.1.0 alpha3
+
+* Thu May 27 2021 Wen Liang <wenliang@redhat.com> - 1.1.0-0.1
+- Upgrade to 1.1.0 alpha1
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.2-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Sun Feb 21 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.0.2-2
+- Add missing source to source file
+
+* Sun Feb 21 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.0.2-1
+- Upgrade to 1.0.2
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

 * Tue Jan 19 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.0.1-1
- Upgrade to 1.0.1. RHBZ#1881287
-
-* Tue Jan 05 2021 Gris Ge <fge@redhat.com> - 1.0.1-0.1
- Upgrade to 1.0.1 alpha 1
+- Upgrade to 1.0.1

 * Tue Dec 08 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.0.0-1
 - Upgrade to 1.0.0

-* Mon Nov 16 2020 Gris Ge <fge@redhat.com> - 1.0.0-0.1
- Upgrade to 1.0.0 alpha 1
-
-* Wed Oct 28 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.4.1-2
- Allow VRF port to hold IP information
-
 * Thu Oct 22 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.4.1-1
 - Upgrade to 0.4.1

-* Tue Oct 20 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.4.0-3
- Add nispor as a dependency for CI gating
+* Tue Oct 13 2020 Gris Ge <fge@redhat.com> - 0.4.0-2
+- Fix the ELN build by put ovs stuff as soft requirement.

-* Tue Oct 20 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.4.0-2
- Rebuild for CI gating
- Remove old patches from the repository
-
-* Mon Sep 14 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.4.0-1
+* Sun Sep 20 2020 Gris Ge <fge@redhat.com> - 0.4.0-1
 - Upgrade to 0.4.0
- Sync. up with upstream spec file.

-* Tue Aug 18 2020 Gris Ge <fge@redhat.com> - 0.3.4-12
- New patch: OVSDB: Allowing remove all OVS ports. RHBZ#1869345
+* Mon Aug 31 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.5-1
+- Update to 0.3.5

-* Tue Aug 18 2020 Gris Ge <fge@redhat.com> - 0.3.4-11
- OVSDB: Allowing remove all OVS ports. RHBZ#1869345
-
-* Thu Aug 06 2020 Gris Ge <fge@redhat.com> - 0.3.4-10
- OVSDB: Preserv old external_ids. RHBZ#1866269
-
-* Tue Aug 04 2020 Gris Ge <fge@redhat.com> - 0.3.4-9
- Fix converting memory only profile to persistent. RHBZ#1859844
-
-* Mon Aug 03 2020 Gris Ge <fge@redhat.com> - 0.3.4-8
- Fix failure when adding ovs bond to existing bridge. RHBZ#1858758
-
-* Thu Jul 30 2020 Gris Ge <fge@redhat.com> - 0.3.4-7
- Remove existing inactivate NM profiles. RHBZ#1862025
-
-* Wed Jul 29 2020 Gris Ge <fge@redhat.com> - 0.3.4-6
- New build to retrigger the CI gating.
-
-* Wed Jul 29 2020 Gris Ge <fge@redhat.com> - 0.3.4-5
- Use new patch. RHBZ#1861668
-
-* Wed Jul 29 2020 Gris Ge <fge@redhat.com> - 0.3.4-4
- Ignore unknown interface. RHBZ#1861668
-
-* Tue Jul 28 2020 Gris Ge <fge@redhat.com> - 0.3.4-3
- Add support NetworkManaged exteranl managed interface. RHBZ#1861263
-
-* Tue Jul 28 2020 Gris Ge <fge@redhat.com> - 0.3.4-2
- Hide MTU for OVS patch port. RHBZ#1858762
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

 * Sat Jul 25 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.4-1
- Upgrade to 0.3.4
-
-* Fri Jul 24 2020 Gris Ge <fge@redhat.com> - 0.3.3-3
- Allowing child been marked absent. RHBZ#1859148
-
-* Mon Jul 06 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.3-2
- Fix bug 1850698
+- Update to 0.3.4
+- Sync. with upstream specfile

 * Thu Jul 02 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.3-1
- Upgrade to 0.3.3
+- Update to 0.3.3

-* Mon Jun 29 2020 Gris Ge <fge@redhat.com> - 0.3.2-6
- Improve performance by remove unneeded calls. RHBZ#1820009
+* Tue Jun 16 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.2-1
+- Update to 0.3.2
+- Sync with upstream specfile

-* Mon Jun 29 2020 Gris Ge <fge@redhat.com> - 0.3.2-5
- Sort the pretty state with priority. RHBZ#1806474
+* Tue Jun 09 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.1-1
+- Update to 0.3.1

-* Mon Jun 29 2020 Gris Ge <fge@redhat.com> - 0.3.2-4
- Canonicalize IP address. RHBZ#1816612
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.3.0-5
+- Rebuilt for Python 3.9

-* Mon Jun 29 2020 Gris Ge <fge@redhat.com> - 0.3.2-3
- Improve VLAN MTU error message. RHBZ#1788763
+* Fri May 08 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.0-4
+- Fix source path

-* Mon Jun 29 2020 Gris Ge <fge@redhat.com> - 0.3.2-2
- Fix bug 1850698
+* Fri May 08 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.0-3
+- Fix signature verification

-* Mon Jun 15 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.2-1
- Upgrade to 0.3.2
- Sync. up with upstream spec file
+* Fri May 08 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.0-2
+- Update signature verification

-* Thu Jun 11 2020 Gris Ge <fge@redhat.com> - 0.3.1-1
- Upgrade to 0.3.1
+* Fri May 08 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.0-1
+- Update to 0.3.0
+- Sync with upstream specfile

-* Wed May 13 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.0-1
- Upgrade to 0.3.0
- Sync. up with upstream spec file.
- Update signature verification.
+* Tue Apr 21 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.10-1
+- Update to 0.2.10

-* Tue Mar 31 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.9-1
- Upgrade to 0.2.9
+* Thu Mar 26 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.9-1
+- Update to 0.2.9

-* Wed Mar 25 2020 Gris Ge <fge@redhat.com> - 0.2.6-6
- Support 3+ DNS name server(IPv4 only or IPv6 only). RHBZ #1816043
+* Fri Mar 13 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.8-1
+- Update to 0.2.8

-* Fri Mar 20 2020 Gris Ge <fge@redhat.com> - 0.2.6-5
- Support static DNS with DHCP. RHBZ #1815112
+* Wed Mar 04 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.7-1
+- Update to 0.2.7

-* Thu Mar 12 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.6-4.8
- Fix bond mac and options regression. RHBZ #1809330
+* Mon Feb 24 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.6-1
+- Update to 0.2.6

-* Mon Mar 09 2020 Gris Ge <fge@redhat.com> - 0.2.6-3.8
- Fix change bond mode. RHBZ #1809330
+* Wed Feb 19 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.5-1
+- Update to 0.2.5
+- Sync with upstream specfile

-* Mon Mar 02 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.6-2.7
- Fix cmd stuck when trying to create ovs-bond. RHBZ #1806249.
-
-* Tue Feb 25 2020 Gris Ge <fge@redhat.com> - 0.2.6-1
- Upgrade to 0.2.6
-
-* Thu Feb 20 2020 Gris Ge <fge@redhat.com> - 0.2.5-1
- Upgrade to 0.2.5
-
-* Thu Feb 13 2020 Gris Ge <fge@redhat.com> - 0.2.4-2
- Fix failure when editing existing OVS interface. RHBZ #1786935
-
-* Thu Feb 13 2020 Gris Ge <fge@redhat.com> - 0.2.4-1
- Upgrade to 0.2.4
+* Wed Feb 12 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.4-1
+- Update to 0.2.4

 * Wed Feb 05 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.3-1
- Upgrade to 0.2.3
+- Update to 0.2.3

-* Tue Feb 04 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.2-3
- Fix the incorrect source
+* Tue Feb 04 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.2-1
+- Update to 0.2.2
+- Sync with upstream specfile

-* Tue Feb 04 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.2-2
- Upgrade to 0.2.2
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

-* Wed Jan 22 2020 Gris Ge <fge@redhat.com> - 0.2.0-3.1
- Fix the memeory leak of NM.Client. RHBZ #1784707
+* Tue Jan 14 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.1-2
+- Fix changelog

-* Mon Dec 02 2019 Gris Ge <fge@redhat.com> - 0.2.0-2
- Fix the incorrect source tarbal.
+* Tue Jan 14 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.1-1
+- Update to 0.2.1

-* Mon Dec 02 2019 Gris Ge <fge@redhat.com> - 0.2.0-1
- Upgrade to nmstate 0.2.0
+* Tue Dec 03 2019 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.0-2
+- Fix changelog

-* Mon Dec 02 2019 Gris Ge <fge@redhat.com> - 0.1.1-4
- Fix the problem found by CI gating.
+* Tue Dec 03 2019 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.0-1
+- Update to 0.2.0

-* Mon Dec 02 2019 Gris Ge <fge@redhat.com> - 0.1.1-3
- Bump dist number as RHEL 8.1.1 took 0.1.1-2.
+* Mon Dec 02 2019 Till Maas <opensource@till.name> - 0.1.1-1
+- Update to 0.1.1
+- Sync with upstream specfile

-* Mon Dec 02 2019 Gris Ge <fge@redhat.com> - 0.1.1-2
- Upgrade to nmstate 0.1.1.
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.0.8-3
+- Rebuilt for Python 3.8.0rc1 (#1748018)

-* Tue Sep 10 2019 Gris Ge <fge@redhat.com> - 0.0.8-15
- Detach slaves without deleting them: RHBZ #1749632
-
-* Fri Sep 06 2019 Gris Ge <fge@redhat.com> - 0.0.8-14
- Preserve (dynamic) IPv6 address base on MAC address: RHBZ #1748825
-
-* Fri Sep 06 2019 Gris Ge <fge@redhat.com> - 0.0.8-13
- Prioritize master interfaces activaction: RHBZ #1749314
-
-* Mon Sep 02 2019 Gris Ge <fge@redhat.com> - 0.0.8-12
- Fix slave activatoin race: RHBZ #1741440
-
-* Mon Sep 02 2019 Gris Ge <fge@redhat.com - 0.0.8-11
- Add NetworkManager-config-server dependency: Fix RHBZ #1740085
-
-* Thu Aug 15 2019 Gris Ge <fge@redhat.com> - 0.0.8-10
- Fix RHBZ #1740125
-
-* Wed Aug 14 2019 Gris Ge <fge@redhat.com> - 0.0.8-9
- Fix RHBZ #1741049
-
-* Wed Aug 14 2019 Gris Ge <fge@redhat.com> - 0.0.8-8
- Fix RHBZ #1740584
-
-* Tue Aug 13 2019 Gris Ge <fge@redhat.com> - 0.0.8-7
- Fix RHBZ #1740554
-
-* Tue Aug 13 2019 Gris Ge <fge@redhat.com> - 0.0.8-6
- Bump release tag as CNV took the -5.
-
-* Tue Aug 13 2019 Gris Ge <fge@redhat.com> - 0.0.8-5
- Bump release tag as CNV took the -4.
-
-* Tue Aug 13 2019 Gris Ge <fge@redhat.com> - 0.0.8-4
- Disable reapply on ipv6 to fix bug 1738101.
-
-* Fri Jul 26 2019 Gris Ge <fge@redhat.com> - 0.0.8-3
- Fix the license to meet Fedora/RHEL guideline.
-
-* Fri Jul 26 2019 Gris Ge <fge@redhat.com> - 0.0.8-2
- Relicense to LGPL2.1+.
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.0.8-2
+- Rebuilt for Python 3.8

 * Fri Jul 26 2019 Gris Ge <fge@redhat.com> - 0.0.8-1
 - Upgrade to 0.0.8.

+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Jun 14 2019 Gris Ge <fge@redhat.com> - 0.0.7-2
+- Workaround broken dbus-python packaging:
+   https://bugzilla.redhat.com/show_bug.cgi?id=1654774
+
 * Fri Jun 14 2019 Gris Ge <fge@redhat.com> - 0.0.7-1
- Upgrade to 0.0.7.
+- Upgrade to 0.0.7

-* Mon Apr 22 2019 Gris Ge <fge@redhat.com> - 0.0.5-3
- Add missing runtime dependency.
+* Sun May 05 2019 Gris Ge <fge@redhat.com> - 0.0.6-1
+- Upgrade to 0.0.6

-* Thu Mar 21 2019 Gris Ge <fge@redhat.com> - 0.0.5-2
- Rebuild to enable CI testing.
+* Fri Apr 12 2019 Gris Ge <fge@redhat.com - 0.0.5-2
+- Add missing runtime requirement: python3-dbus

-* Mon Mar 18 2019 Gris Ge <fge@redhat.com> - 0.0.5-1
- Initial release
+* Tue Mar 12 2019 Gris Ge <fge@redhat.com> - 0.0.5-1
+- Upgrade to 0.0.5
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jan 29 2019 Till Maas <opensource@till.name> - 0.0.4-2
+- Sync with upstream spec
+- Use Recommends for NetworkManager
+- Add Suggests for NetworkManager-ovs
+- package examples as doc
+
+* Thu Jan 24 2019 Gris Ge <fge@redhat.com> - 0.0.4-1
+- Upgrade to 0.0.4.
+
+* Mon Jan 21 2019 Gris Ge <fge@redhat.com> - 0.0.3-3
+- Add missing runtime dependency for nmstatectl.
+
+* Wed Jan 02 2019 Gris Ge <fge@redhat.com> - 0.0.3-2
+- Add source file PGP verification.
+
+* Thu Dec 20 2018 Gris Ge <fge@redhat.com> - 0.0.3-1
+- Upgrade to 0.0.3.
+
+* Mon Dec 03 2018 Gris Ge <fge@redhat.com> - 0.0.2-2
+- Trival RPM SPEC fix.
+
+* Wed Nov 28 2018 Gris Ge <fge@redhat.com> - 0.0.2-1
+- Initial release.