.gitignore

@@ -1,2 +1,2 @@
-SOURCES/nmstate-1.4.5.tar.gz
+SOURCES/nmstate-2.2.27.tar.gz
-SOURCES/nmstate-vendor-1.4.5.tar.xz
+SOURCES/nmstate-vendor-2.2.27.tar.xz

.nmstate.metadata

@@ -1,2 +1,2 @@
-cd4f8e938eabaf7e70fb251c06e477ba3bc9d8c8 SOURCES/nmstate-1.4.5.tar.gz
+1544be5eeb6cb7e8ff0317e4212af21eede45950 SOURCES/nmstate-2.2.27.tar.gz
-4735ef08c31684624a7844832cc2ba20e67983f6 SOURCES/nmstate-vendor-1.4.5.tar.xz
+5379d1f7aedfdc62808cfa91c917178784ddb6aa SOURCES/nmstate-vendor-2.2.27.tar.xz

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
-

SOURCES/RHEL-13936-dns-opt-fix.patch

@@ -1,157 +0,0 @@
-From c95e26154cfe105faedb6fe6187e89da658e6d02 Mon Sep 17 00:00:00 2001
-From: Gris Ge <fge@redhat.com>
-Date: Tue, 14 Nov 2023 16:08:35 +0800
-Subject: [PATCH 1/2] dns: Fix DNS option `ndots`, `timeout` and `attempts`
-
-The `ndots`, `timeout` and `attempts` DNS options are allowed to
-hold a integer value in the format of `<opt_name>:<int>`. Previously,
-nmstate is treating them as invalid DNS option. This patch fix it.
-
-Now this YAML is supported:
-
-```yml
-dns-resolver:
-  config:
-    options:
-    - rotate
-    - ndots:9
-```
-
-Integration test cases included.
-
-Signed-off-by: Gris Ge <fge@redhat.com>
----
- libnmstate/dns.py | 31 ++++++++++++++++++++++++-------
- 1 file changed, 24 insertions(+), 7 deletions(-)
-
-diff --git a/libnmstate/dns.py b/libnmstate/dns.py
-index f792b896..5bb512e8 100644
---- a/libnmstate/dns.py
-+++ b/libnmstate/dns.py
-@@ -19,14 +19,12 @@ EMPTY_DNS = {
- REMOVE_DNS_CONFIG = {DNS.CONFIG: EMPTY_DNS}
- 
- 
--SUPPORTED_DNS_OPTIONS = [
--    "attempts",
-+SUPPORTED_DNS_OPTS_NO_VALUE = [
-     "debug",
-     "edns0",
-     "inet6",
-     "ip6-bytestring",
-     "ip6-dotint",
--    "ndots",
-     "no-aaaa",
-     "no-check-names",
-     "no-ip6-dotint",
-@@ -35,11 +33,16 @@ SUPPORTED_DNS_OPTIONS = [
-     "rotate",
-     "single-request",
-     "single-request-reopen",
--    "timeout",
-     "trust-ad",
-     "use-vc",
- ]
- 
-+SUPPORTED_DNS_OPTS_WITH_VALUE = [
-+    "ndots",
-+    "timeout",
-+    "attempts",
-+]
-+
- 
- class DnsState:
-     PRIORITY_METADATA = "_priority"
-@@ -73,10 +76,24 @@ class DnsState:
- 
-     def _canonicalize_dns_options(self):
-         for opt in self.config_options:
--            if opt not in SUPPORTED_DNS_OPTIONS:
-+            if opt.find(":") > 0:
-+                opt = opt[: opt.find(":")]
-+                if opt not in SUPPORTED_DNS_OPTS_WITH_VALUE:
-+                    raise NmstateValueError(
-+                        "Option '{}' is not supported to hold "
-+                        "a value, only support these without "
-+                        "value: {} and these with values: {}:n",
-+                        opt,
-+                        ", ".join(SUPPORTED_DNS_OPTS_NO_VALUE),
-+                        ":n, ".join(SUPPORTED_DNS_OPTS_WITH_VALUE),
-+                    )
-+            elif opt not in SUPPORTED_DNS_OPTS_NO_VALUE:
-                 raise NmstateValueError(
--                    f"Unsupported DNS option {opt}, only support: "
--                    f"{', '.join(SUPPORTED_DNS_OPTIONS)}",
-+                    "Option '{}' is not supported, only support these "
-+                    "without value: {} and these with values: {}:n",
-+                    opt,
-+                    ", ".join(SUPPORTED_DNS_OPTS_NO_VALUE),
-+                    ":n, ".join(SUPPORTED_DNS_OPTS_WITH_VALUE),
-                 )
- 
-     @property
--- 
-2.42.1
-
-
-From af07271ec5044ec092a3b66c0955636819ccde04 Mon Sep 17 00:00:00 2001
-From: Gris Ge <fge@redhat.com>
-Date: Tue, 14 Nov 2023 16:16:53 +0800
-Subject: [PATCH 2/2] dns: Fix purging DNS config
-
-When user desires:
-
-```yml
----
-dns-resolver:
-  config:
-    search: []
-```
-
-It means user want to remove all search but preserve servers and
-options, current nmstate incorrectly treat this as purge also.
-
-This patch only treat these two as purge.
-
-```yml
-dns-resolver:
-  config: {}
-```
-
-and
-
-```yml
-dns-resolver:
-  config:
-    server: []
-    search: []
-    options: []
-```
-
-Integration test cases included.
-
-Signed-off-by: Gris Ge <fge@redhat.com>
----
- libnmstate/nm/dns.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/libnmstate/nm/dns.py b/libnmstate/nm/dns.py
-index 60ebbba7..b811fdb2 100644
---- a/libnmstate/nm/dns.py
-+++ b/libnmstate/nm/dns.py
-@@ -158,7 +158,11 @@ def get_dns_config_iface_names(acs_and_ipv4_profiles, acs_and_ipv6_profiles):
-     for nm_ac, ip_profile in chain(
-         acs_and_ipv6_profiles, acs_and_ipv4_profiles
-     ):
--        if ip_profile.props.dns or ip_profile.props.dns_search:
-+        if (
-+            ip_profile.props.dns
-+            or ip_profile.props.dns_search
-+            or ip_profile.props.dns_options
-+        ):
-             try:
-                 iface_name = nm_ac.get_devices()[0].get_iface()
-                 iface_names.append(iface_name)
--- 
-2.42.1
-

SOURCES/nmstate-1.4.5.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEESP1vrlFad7SENoIch4lWe4cVzrwFAmVDid0ACgkQh4lWe4cV
-zrx26BAAqv8ec7UMDkJ7MGAXwRpMZrLQ+zjPIDlVH0HVmdvZY2g8Lx2iK9g0xHeL
-YGdVk3aL3UwQE/5Tt6qtzQ8sk76dWyveS1XxxNDLZa+TKvcGqDbxnmvOAIBJwrlD
-4Q6MNWqudJDsboGotKSAoI/xHJafFzWfHU+SSp4AHtf2xHa2KFZqmaZW5gVdYq9j
-/Zhepz8OQ+1s8/frVw1JEqKaTcw5gc0/2xNzh0MkC714Lkk4dhITHP6zh1HF/2i8
-LPIdVHMI8Ze7w4imiamr38+G3XzCQJ/6A/N6couFyJXrLgCn0Jm7Zv8t3TLW69JA
-QD/YHcFgeZmh3QRHVoNIOunG7X7eczLjy61VVXMp3F38+GWSLxK2f7DMRyzRvIxF
-uBrd9yBZ4qkSEqIG2tEBIZOPg4deDADaesyD3d5c0JROsmxkmhl9SEBk03qWtJEY
-kWhCF4tGvVp1r+W7AjS6QpqAtFXJcBQdj1qs49fgRxVGjmw2ljMQdLT6O/oSFNpS
-wzjvGhh8WvMcmStCQ0crTOeihYTyJu2PPqJ3c373EnE9xPN3cJVh+AGwV5kcpxkk
-bJF8qooJDq7MAuNqiKdXORGzG0ht16TzJ4aE+1vGFAErYZitCzU13rkW3dKIU19h
-KgFqlKXUHCS6J3KzJQszDpn+Hw8WOvcCQQ1LivcyLKHlvmTQPi4=
-=51yt
------END PGP SIGNATURE-----

SOURCES/nmstate-2.2.27.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEESP1vrlFad7SENoIch4lWe4cVzrwFAmX6y6QACgkQh4lWe4cV
+zryuWRAAlydx8aPGbvyqKAOEDNSzaxpDO1rr8eEw25Jj0GNHGjd2kqVuH1RVTNTK
+hED5tM/yp75plp6PerGl1FR18Hwf1E8Ld5udZIF6ai7QfWC74lZ0R6hIS/WitAEH
+mHKhqtxuJ+Te899XiGMKMB1ZOpaw+2+8rm17wNV6vKxrQifLHYxZKZFCg26iAtiN
+F+Cpf/KPL9g+jidFLt6QdaO3q0fjklscrAt7IzzrGsoXo9hZSeU2sT+hdqmvBkoZ
+8PCPjRKYwju/O3bw8FvHVauQxG0m8yWttLPZgx6sNf8ObBj0lopmg0NjArRVvfy9
+34jsebKrI6NSSKk+1GXAKSoarpyh9QZWt3ie2NcX+Rm7bwUdsxKBtK1NOKF30fOn
+X1TNPAsNQsCS2IS6fH47hIL60QJkJhd/eGXGf7aKBVNM0f3LYrQ/B3SzvzuWaC6o
+AYuKmOnK81Y02RPE6c3UbsxRk/e9d5yuyT7LDN/DEvx7B82okFQXEw+xarwUQKda
+4/Upo86+AFlHIVmJHGdfyCSQaPmWOZYT1uIfDu/6Wy2A4Qnx6SIOOpcsTFG2F9nd
+p7rNvH3cVWWYWLExePL4H4YeU/Lpbo9hnQm/5Qz/c0IKvErySrxZLlHyCSoYVDP/
+F/ZVD/2C5z4ReuGPfQDuHVVNy8gtcHSkId3wvEptnoiJtlb+UwA=
+=Bla3
+-----END PGP SIGNATURE-----

SOURCES/nmstate.gpg

@@ -94,6 +94,53 @@ V95yJtLnCnFdKlnyzT9HDepWfG8266hgBD+OQ/Kvhx6SmIImCgMOtcDW+fAz3X5L
 YjVo4IPCmJLRb9b8kPX9JuJWDnYWd0SOB00ImaGeXd/kV8W30Lss1OeQ7iya/Ej7
 t878uw4RVPKsgCQTWKOWhC0r0DNE/bskGrWZAJGC3M7yqzAErxiIOBKRwH2haegT
 syMyW5sNgF43zvxzEHACZnbx+qzHYf+SeQg4pRxLlZj6/Udc3hM/j1cGkMMiwl23
-i2QY7dEEs/uMRtq8C8kSWg==
+i2QY7dEEs/uMRtq8C8kSWpkCDQRg3IskARAAwPd8TTsqamyztyFvxNlAiKu8fG4a
-=259x
+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
+KfYnetRPLeXiMqWKTUaImA==
+=a0yN
 -----END PGP PUBLIC KEY BLOCK-----

SPECS/nmstate.spec

@@ -3,25 +3,21 @@
 %define libname libnmstate
 
 Name:           nmstate
-Version:        1.4.5
+Version:        2.2.27
 Release:        2%{?dist}
 Summary:        Declarative network manager API
 License:        LGPLv2+
 URL:            https://github.com/%{srcname}/%{srcname}
-Source0:        %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz
+Source0:        https://github.com/nmstate/nmstate/releases/download/v%{version}/nmstate-%{version}.tar.gz
-Source1:        %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc
+Source1:        https://github.com/nmstate/nmstate/releases/download/v%{version}/nmstate-%{version}.tar.gz.asc
-Source2:        https://www.nmstate.io/nmstate.gpg
+Source2:        https://nmstate.io/nmstate.gpg
-Source3:        %{url}/releases/download/v%{version}/%{srcname}-vendor-%{version}.tar.xz
+Source3:        https://github.com/nmstate/nmstate/releases/download/v%{version}/nmstate-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:        RHEL-13936-dns-opt-fix.patch
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  gnupg2
 BuildRequires:  rust-toolset
 BuildRequires:  pkg-config
-Requires:       python3-setuptools
+BuildRequires:  systemd
-Requires:       python3-%{libname} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 Nmstate is a library with an accompanying command line tool that manages host
@@ -30,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
@@ -43,38 +46,33 @@ Recommends:     NetworkManager-config-server
 # required for OVS and team support
 Suggests:       NetworkManager-ovs
 Suggests:       NetworkManager-team
-Requires:       nispor
+# FIXME: Once upstream included nispor into requirement.txt, remove below line
-Requires:       python3dist(varlink)
+Provides:       nmstate-plugin-ovsdb = %{version}-%{release}
-
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-%package -n nmstate-plugin-ovsdb
+Obsoletes:      nmstate-plugin-ovsdb < 2.1-1
-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
 
 %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
+%description -n python3-%{libname}
-This package contains the nmstate plugin for OVS database manipulation.
+This package contains the Python 3 library for Nmstate.
 
 %prep
 gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgkey-mantainers.gpg
@@ -85,52 +83,44 @@ pushd rust
 # Source3 is vendored dependencies
 %cargo_prep -V 3
 
-# The cargo_prep will create `.cargo/config` which take precedence over
-# `.cargo/config.toml` shipped by upstream which fix the SONAME of cdylib.
-# To workaround that, merge upstream rustflags into cargo_prep created one.
-_FLAGS=`sed -ne 's/rustflags = "\(.\+\)"/\1/p' .cargo/config.toml`
-sed -i -e "s/rustflags = \[\(.\+\), \]$/rustflags = [\1, \"$_FLAGS\"]/" \
-    .cargo/config
-rm .cargo/config.toml
-
 popd
 
 %build
+pushd rust/src/python
 %py3_build
-
+popd
 pushd rust
-make
+%cargo_build
 popd
 
 %install
-%py3_install
-pushd rust
 env SKIP_PYTHON_INSTALL=1 \
-   PREFIX=%{_prefix} \
+    PREFIX=%{_prefix} \
-   LIBDIR=%{_libdir} \
+    LIBDIR=%{_libdir} \
-   %make_install
+    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
@@ -142,6 +132,9 @@ popd
 %{_includedir}/nmstate.h
 %{_libdir}/pkgconfig/nmstate.pc
 
+%files static
+%{_libdir}/libnmstate.a
+
 %post libs
 /sbin/ldconfig
 
@@ -149,376 +142,362 @@ popd
 /sbin/ldconfig
 
 %changelog
-* Wed Nov 15 2023 Gris Ge <fge@redhat.com> - 1.4.5-2
+* Fri Apr 05 2024 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.27-2
-- Fix use case on purging DNS option. RHEL-13936
+- Rebuild to use the right target
 
-* Thu Nov 02 2023 Gris Ge <fge@redhat.com> - 1.4.5-1
+* Fri Apr 05 2024 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.27-1
-- Support DNS option. RHEL-13936
+- Upgrade to 2.2.27-1
 
-* Wed Oct 04 2023 Wen Liang <wenliang@redhat.com> - 1.4.4-5
+* Thu Feb 22 2024 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.25-1
-- Support treating string as int for address prefix-length. RHEL-3358
+- Upgrade to 2.2.25
 
-* Wed Aug 30 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.4.4-4
+* Thu Feb 08 2024 Gris Ge <fge@redhat.com> - 2.2.24-1
-- Fix issue with ovs-bridge and ovs-interface with same name. RHBZ#2231843
+- Upgrade to 2.2.24
 
-* Tue May 30 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.4.4-3
+* Thu Jan 18 2024 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.23-1
-- Support static route with auto-ip. RHBZ#2203277
+- Upgrade to 2.2.23.
 
-* Mon Apr 24 2023 Gris Ge <fge@redhat.com> - 1.4.4-2
+* Fri Jan 05 2024 Gris Ge <fge@redhat.com> - 2.2.22-1
-- Enable CI gating.
+- Upgrade to 2.2.22.
 
-* Sun Apr 23 2023 Gris Ge <fge@redhat.com> - 1.4.4-1
+* Tue Dec 19 2023 Gris Ge <fge@redhat.com> - 2.2.21-2
-- Upgrade to nmstate 1.4.4
+- Fix `ipsec-interface` option. RHEL-17403
 
-* Wed Mar 29 2023 Gris Ge <fge@redhat.com> - 1.4.3-1
+* Fri Dec 15 2023 Íñigo Huguet <ihuguet@redhat.com> - 2.2.21-1
-- Upgrade to nmstate 1.4.3. RHBZ#2179899
+- Upgrade to 2.2.21.
 
-* Mon Feb 27 2023 Gris Ge <fge@redhat.com> - 1.4.2-4
+* Thu Nov 30 2023 Gris Ge <fge@redhat.com> - 2.2.20-1
-- Ignore undesired iface config. RHBZ#2160416
+- Upgrade to 2.2.20.
 
-* Thu Feb 23 2023 Gris Ge <fge@redhat.com> - 1.4.2-3
+* Wed Nov 15 2023 Gris Ge <fge@redhat.com> - 2.2.19-1
-- Additional patch for SR-IOV. RHBZ#2160416
+- Upgrade to 2.2.19.
 
-* Wed Feb 22 2023 Gris Ge <fge@redhat.com> - 1.4.2-2
+* Thu Nov 02 2023 Gris Ge <fge@redhat.com> - 2.2.18-1
-- Enable YAML API in rust clib.
+- Upgrade to 2.2.18.
 
-* Sat Feb 18 2023 Gris Ge <fge@redhat.com> - 1.4.2-1
+* Thu Sep 21 2023 Gris Ge <fge@redhat.com> - 2.2.16-1
-- Upgrade to nmstate 1.4.2
+- Upgrade to 2.2.16.
 
-* Mon Jan 09 2023 Gris Ge <fge@redhat.com> - 1.4.1-1
+* Mon Sep 04 2023 Gris Ge <fge@redhat.com> - 2.2.15-3
-- Upgrade to nmstate-1.4.1
+- Rebuild for RHEL 9.4.
 
-* Wed Dec 14 2022 Gris Ge <fge@redhat.com> - 1.4.0-1
+* Wed Aug 30 2023 Gris Ge <fge@redhat.com> - 2.2.15-2
-- Upgrade to nmstate-1.4.0
+- Rebuild for RHEL 9.3.
 
-* Thu Dec 01 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.4.0.alpha.20221201
+* Wed Aug 23 2023 Gris Ge <fge@redhat.com> - 2.2.15-1
-- Upgrade to nmstate-1.4.0.alpha.20221201
+- Upgrade to 2.2.15
 
-* Fri Nov 18 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.3.4.alpha.20221118
+* Wed Jul 26 2023 Gris Ge <fge@redhat.com> - 2.2.14-1
-- Upgrade to nmstate-1.3.4.alpha.20221118
+- Upgrade to 2.2.14
 
-* Mon Oct 24 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.3.4.alpha.20221024
+* Thu Jul 13 2023 Gris Ge <fge@redhat.com> - 2.2.13-1
-- Undo the branching misdone by Fernando.
+- Upgrade to 2.2.13
 
-* Mon Aug 15 2022 Gris Ge <fge@redhat.com> - 1.3.3-1
+* Wed Jun 07 2023 Gris Ge <fge@redhat.com> - 2.2.12-2
-- Upgrade to nmstate-1.3.3
+- Fix regression on SRIOV timeout. RHBZ#2212380
 
-* Tue Aug 02 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.3.2-1
+* Thu Jun 01 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.12-1
-- Upgrade to nmstate-1.3.2
+- Upgrade to 2.2.12
 
-* Wed Jul 20 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.3.1-1
+* Wed May 17 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.11-1
-- Upgrade to nmstate-1.3.1
+- Upgrade to 2.2.11
 
-* Fri Jul 01 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.3.1-0.alpha.20220701
+* Tue Apr 25 2023 Gris Ge <fge@redhat.com> - 2.2.10-3
-- Upgrade to nmstate-1.3.1-0.alpha.20220701
+- Fix error when DHCP enabled with auto ip on STP bridge
 
-* Mon Jun 13 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.3.0-1
+* Sun Apr 23 2023 Gris Ge <fge@redhat.com> - 2.2.10-2
-- Upgrade to nmstate-1.3.0-1
+- Do not pin NIC if `net.ifnames=0`
 
-* Thu May 05 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.3.0-0.alpha.20220505
+* Thu Mar 23 2023 Gris Ge <fge@redhat.com> - 2.2.9-1
-- Upgrade to nmstate-1.3.0.alpha.20220505
+- Upgrade to 2.2.9
 
-* Thu Apr 07 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.3.0-0.alpha.20220407
+* Sun Mar 12 2023 Gris Ge <fge@redhat.com> - 2.2.8-1
-- Upgrade to nmstate-1.3.0.alpha.20220407
+- Upgrade to 2.2.8
 
-* Thu Mar 10 2022 Gris Ge <fge@redhat.com> - 1.3.0-0.alpha.20220310
+* Fri Feb 17 2023 Gris Ge <fge@redhat.com> - 2.2.7-1
-Upgrade to nmstate-1.3.0-0.alpha.20220310
+- Upgrade to 2.2.7
 
-* Mon Feb 14 2022 Gris Ge <fge@redhat.com> - 1.2.1-1
+* Thu Feb 09 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.6-1
-- Upgrade to 1.2.1. RHBZ#1996618
+- Upgrade to 2.2.6
 
-* Thu Jan 27 2022 Gris Ge <ferferna@redhat.com> - 1.2.1-0.2.alpha2
+* Thu Jan 26 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.5-1
-- Upgrade to 1.2.1 alpha2. RHBZ#1996618
+- Upgrade to 2.2.5
 
-* Thu Jan 13 2022 Gris Ge <fge@redhat.com> - 1.2.1-0.1.alpha1
+* Thu Jan 19 2023 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.4-1
-- Upgrade to 1.2.1 alpha1. RHBZ#1996618
+- Upgrade to 2.2.4
 
-* Thu Dec 16 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.2.0-1
+* Wed Jan 11 2023 Gris Ge <fge@redhat.com> - 2.2.3-3
-- Upgrade to 1.2.0. RHBZ#1996618
+- Fix OVSDB verification error
 
-* Thu Dec 09 2021 Gris Ge <fge@redhat.com> - 1.2.0-0.1.alpha2
+* Tue Jan 10 2023 Gris Ge <fge@redhat.com> - 2.2.3-2
-- Upgrade to 1.2.0 alpha2. RHBZ#1996618
+- Enable error message for rpm CI gating
 
-* Tue Oct 12 2021 Gris Ge <fge@redhat.com> - 1.2.0-0.1.alpha1
+* Mon Jan 09 2023 Gris Ge <fge@redhat.com> - 2.2.3-1
-- Upgrade to 1.2.0 alpha1.
+- Upgrade to 2.2.3
 
-* Wed Sep 15 2021 Ana Cabral <acabral@redhat.com> - 1.1.1-0.1.alpha1
+* Thu Dec 15 2022 Gris Ge <fge@redhat.com> - 2.2.2-2
-- Upgrade to 1.1.1 alpha1.
+- Fix regression on VRF interface.
-- Canonicalize ipv6 addresses for dns nameservers. RHBZ#1911241
-- Throw better error when peer is missing for veth interfaces. RHBZ#1973973
 
-* Tue Jul 27 2021 Gris Ge <fge@redhat.com> - 1.1.0-3
+* Wed Dec 14 2022 Gris Ge <fge@redhat.com> - 2.2.2-1
-- Fix state=ignore for OVS interface. RHBZ#1944054
+- Upgrade to 2.2.2
-- Fix verification for next hop address 0.0.0.0. RHBZ#1985879
 
-* Fri Jul 23 2021 Gris Ge <fge@redhat.com> - 1.1.0-2
+* Thu Dec 01 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.2-0.alpha.20221201.c8c776e9
-- Preserving existing ethtool settings. RHBZ#1984764
+- Upgrade to 2.2.2-0.alpha.20221201.c8c776e9
 
-* Thu Jul 15 2021 Gris Ge <fge@redhat.com> - 1.1.0-1
+* Wed Nov 16 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.1-1
-- Upgrade to 1.1.0.
+- Upgrade to 2.2.1
 
-* Fri Jul 09 2021 Gris Ge <fge@redhat.com> - 1.1.0-0.7.alpha7
+* Thu Nov 10 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.1-0.alpha.20221110.a9cee09d
-- Upgarde to 1.1.0 alpha7.
+- Upgrade to 2.2.1-0.alpha.20221110.a9cee09d
 
-* Thu Jul 01 2021 Gris Ge <fge@redhat.com> - 1.1.0-0.6.alpha6
+* Mon Oct 17 2022 Gris Ge <fge@redhat.com> - 2.2.0-1
-- Upgrade to 1.1.0 alpha6.
+- Upgrade to 2.2.0
 
-* Mon Jun 21 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.1.0-0.5.alpha4
+* Fri Oct 14 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.2.0-0.alpha.20221014.e54d9ae0
-- Upgrade to 1.1.0 alpha4.
+- Upgrade to 2.2.0-alpha.20221014.e54d9ae0
 
-* Wed Jun 16 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.1.0-0.4.alpha3
+* Mon Aug 15 2022 Gris Ge <fge@rehda.tcom> - 2.1.4-1
-- Rebuild to introduce CI gating tier1 tests. RHBZ#1813357
+- Upgrade to 2.1.4
 
-* Tue Jun 08 2021 Gris Ge <fge@redhat.com> - 1.1.0-0.3.alpha3
+* Thu Jul 28 2022 Gris Ge <fge@redhat.com> - 2.1.3-1
-- Upgrade to 1.1.0 alpha3.
+- Upgraded to 2.1.3
 
-* Mon Jun 07 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.1.0-0.2
+* Wed Jul 20 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.1.3-20220720.cf972e4d
-- Upgrade to 1.1.0 alpha2.
+- Upgrade to nmstate-2.1.3-20220720.cf972e4d
 
-* Wed May 19 2021 Wen Liang <wenliang@redhat.com> - 1.1.0-0.1
+* Thu Jul 14 2022 Gris Ge <fge@redhat.com> - 2.1.3-20220714.81d80992
-- Upgrade to 1.1.0 alpha1.
+- Upgrade to nmstate-2.1.3-20220714.81d80992
 
-* Tue Apr 20 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.0.3-1
+* Thu Jun 30 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.1.2-1
-- Upgrade to 1.0.3. RHBZ#1942458
+- Upgrade to 2.1.2
 
-* Fri Mar 26 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.0.2-6
+* Mon Jun 13 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.1.1-1
-- Rebuild for RHEL 8.5. RHBZ#1935710
+- Upgrade to 2.1.1
 
-* Fri Mar 26 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.0.2-5
+* Thu Jun 02 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.1.1-0.alpha.20220602.5accbd1
-- New patch for fixing unmanaged interfaces being managed. RHBZ#1935710
+- Upgrade to nmstate-2.1.1-0.alpha.20220602.5accbd1
 
-* Tue Feb 23 2021 Gris Ge <fge@redhat.com> - 1.0.2-4
+* Thu May 19 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.1.1-0.alpha.20220519.437e4a9
-- New patch for SRIOV decrease VF amount. RHBZ#1931355
+- Upgrade to nmstate-2.1.1-0.alpha.20220519.437e4a9
 
-* Tue Feb 23 2021 Gris Ge <fge@redhat.com> - 1.0.2-3
+* Fri Apr 22 2022 Gris Ge <fge@redhat.com> - 2.1.0-1
-- Fix actiation failure when decrease VF mount on i40e. RHBZ#1931355
+- Upgrade to 2.1.0
 
-* Tue Feb 23 2021 Gris Ge <fge@redhat.com> - 1.0.2-2
+* Tue Apr 19 2022 Gris Ge <fge@redhat.com> - 2.1.0-0.alpha.20220419.d613311d
-- Fix nmstatectl return code of `set` command. RHBZ#1931751
+- Upgrade to nmstate-2.1.0-0.alpha.20220419.d613311d
 
-* Fri Feb 19 2021 Gris Ge <fge@redhat.com> - 1.0.2-1
+* Thu Apr 07 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.1.0-0.alpha.20220407
-- Upgrade to 1.0.2.
+- Upgrade to nmstate-2.1.0-0.alpha.20220407
 
-* Wed Feb 10 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.0.2-0.3
+* Fri Mar 11 2022 Gris Ge <fge@redhat.com> - 2.1.0-0.alpha.20220311.6f7c2be
-- Fix sources name
+- Upgrade to nmstate-2.1.0-0.alpha.20220311.6f7c2be
 
-* Wed Feb 10 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.0.2-0.2
+* Thu Feb 24 2022 Gris Ge <fge@redhat.com> - 2.0.0-2
-- Upgrade to 1.0.2 alpha 2
+- Force python3-libnmstate and nmstate-plugin-ovsdb as noarch. RHBZ#1996575
 
-* Tue Jan 26 2021 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.0.2-0.1
+* Wed Feb 16 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 2.0.0-1
-- Upgrade to 1.0.2 alpha 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
+- Upgrade to 1.0.1
-
-* Tue Jan 05 2021 Gris Ge <fge@redhat.com> - 1.0.1-0.1
-- Upgrade to 1.0.1 alpha 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
+* Tue Oct 13 2020 Gris Ge <fge@redhat.com> - 0.4.0-2
-- Add nispor as a dependency for CI gating
+- 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
+* Sun Sep 20 2020 Gris Ge <fge@redhat.com> - 0.4.0-1
-- Rebuild for CI gating
-- Remove old patches from the repository
-
-* Mon Sep 14 2020 Fernando Fernandez Mancera <ferferna@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
+* Mon Aug 31 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.5-1
-- New patch: OVSDB: Allowing remove all OVS ports. RHBZ#1869345
+- Update to 0.3.5
 
-* Tue Aug 18 2020 Gris Ge <fge@redhat.com> - 0.3.4-11
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.4-2
-- OVSDB: Allowing remove all OVS ports. RHBZ#1869345
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* 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
 
 * Sat Jul 25 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.4-1
-- Upgrade to 0.3.4
+- Update to 0.3.4
-
+- Sync. with upstream specfile
-* 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
 
 * 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
+* Tue Jun 16 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.2-1
-- Improve performance by remove unneeded calls. RHBZ#1820009
+- Update to 0.3.2
+- Sync with upstream specfile
 
-* Mon Jun 29 2020 Gris Ge <fge@redhat.com> - 0.3.2-5
+* Tue Jun 09 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.1-1
-- Sort the pretty state with priority. RHBZ#1806474
+- Update to 0.3.1
 
-* Mon Jun 29 2020 Gris Ge <fge@redhat.com> - 0.3.2-4
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.3.0-5
-- Canonicalize IP address. RHBZ#1816612
+- Rebuilt for Python 3.9
 
-* Mon Jun 29 2020 Gris Ge <fge@redhat.com> - 0.3.2-3
+* Fri May 08 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.0-4
-- Improve VLAN MTU error message. RHBZ#1788763
+- Fix source path
 
-* Mon Jun 29 2020 Gris Ge <fge@redhat.com> - 0.3.2-2
+* Fri May 08 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.0-3
-- Fix bug 1850698
+- Fix signature verification
 
-* Mon Jun 15 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.2-1
+* Fri May 08 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.0-2
-- Upgrade to 0.3.2
+- Update signature verification
-- Sync. up with upstream spec file
 
-* Thu Jun 11 2020 Gris Ge <fge@redhat.com> - 0.3.1-1
+* Fri May 08 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.0-1
-- Upgrade to 0.3.1
+- Update to 0.3.0
+- Sync with upstream specfile
 
-* Wed May 13 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.3.0-1
+* Tue Apr 21 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.10-1
-- Upgrade to 0.3.0
+- Update to 0.2.10
-- Sync. up with upstream spec file.
-- Update signature verification.
 
-* Tue Mar 31 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.9-1
+* Thu Mar 26 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.9-1
-- Upgrade to 0.2.9
+- Update to 0.2.9
 
-* Wed Mar 25 2020 Gris Ge <fge@redhat.com> - 0.2.6-6
+* Fri Mar 13 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.8-1
-- Support 3+ DNS name server(IPv4 only or IPv6 only). RHBZ #1816043
+- Update to 0.2.8
 
-* Fri Mar 20 2020 Gris Ge <fge@redhat.com> - 0.2.6-5
+* Wed Mar 04 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.7-1
-- Support static DNS with DHCP. RHBZ #1815112
+- Update to 0.2.7
 
-* Thu Mar 12 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.6-4.8
+* Mon Feb 24 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.6-1
-- Fix bond mac and options regression. RHBZ #1809330
+- Update to 0.2.6
 
-* Mon Mar 09 2020 Gris Ge <fge@redhat.com> - 0.2.6-3.8
+* Wed Feb 19 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.5-1
-- Fix change bond mode. RHBZ #1809330
+- Update to 0.2.5
+- Sync with upstream specfile
 
-* Mon Mar 02 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.6-2.7
+* Wed Feb 12 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.4-1
-- Fix cmd stuck when trying to create ovs-bond. RHBZ #1806249.
+- Update to 0.2.4
-
-* 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 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
+* Tue Feb 04 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.2-1
-- Fix the incorrect source
+- Update to 0.2.2
+- Sync with upstream specfile
 
-* Tue Feb 04 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.2-2
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.1-3
-- Upgrade to 0.2.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
-* Wed Jan 22 2020 Gris Ge <fge@redhat.com> - 0.2.0-3.1
+* Tue Jan 14 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.1-2
-- Fix the memeory leak of NM.Client. RHBZ #1784707
+- Fix changelog
 
-* Mon Dec 02 2019 Gris Ge <fge@redhat.com> - 0.2.0-2
+* Tue Jan 14 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.1-1
-- Fix the incorrect source tarbal.
+- Update to 0.2.1
 
-* Mon Dec 02 2019 Gris Ge <fge@redhat.com> - 0.2.0-1
+* Tue Dec 03 2019 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.0-2
-- Upgrade to nmstate 0.2.0
+- Fix changelog
 
-* Mon Dec 02 2019 Gris Ge <fge@redhat.com> - 0.1.1-4
+* Tue Dec 03 2019 Fernando Fernandez Mancera <ferferna@redhat.com> - 0.2.0-1
-- Fix the problem found by CI gating.
+- Update to 0.2.0
 
-* Mon Dec 02 2019 Gris Ge <fge@redhat.com> - 0.1.1-3
+* Mon Dec 02 2019 Till Maas <opensource@till.name> - 0.1.1-1
-- Bump dist number as RHEL 8.1.1 took 0.1.1-2.
+- Update to 0.1.1
+- Sync with upstream specfile
 
-* Mon Dec 02 2019 Gris Ge <fge@redhat.com> - 0.1.1-2
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.0.8-3
-- Upgrade to nmstate 0.1.1.
+- Rebuilt for Python 3.8.0rc1 (#1748018)
 
-* Tue Sep 10 2019 Gris Ge <fge@redhat.com> - 0.0.8-15
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.0.8-2
-- Detach slaves without deleting them: RHBZ #1749632
+- Rebuilt for Python 3.8
-
-* 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+.
 
 * 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
+* Sun May 05 2019 Gris Ge <fge@redhat.com> - 0.0.6-1
-- Add missing runtime dependency.
+- Upgrade to 0.0.6
 
-* Thu Mar 21 2019 Gris Ge <fge@redhat.com> - 0.0.5-2
+* Fri Apr 12 2019 Gris Ge <fge@redhat.com - 0.0.5-2
-- Rebuild to enable CI testing.
+- Add missing runtime requirement: python3-dbus
 
-* Mon Mar 18 2019 Gris Ge <fge@redhat.com> - 0.0.5-1
+* Tue Mar 12 2019 Gris Ge <fge@redhat.com> - 0.0.5-1
-- Initial release
+- 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.