From 1efb16923a1192d775627026150b4b891ac9efa6 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 28 2020 19:19:04 +0000 Subject: import nmstate-0.3.4-1.el8 --- diff --git a/.gitignore b/.gitignore index cfa4a70..4e6d7d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/nmstate-0.3.3.tar.gz +SOURCES/nmstate-0.3.4.tar.gz SOURCES/nmstate.gpg diff --git a/.nmstate.metadata b/.nmstate.metadata index dad6a47..3f697a6 100644 --- a/.nmstate.metadata +++ b/.nmstate.metadata @@ -1,2 +1,2 @@ -ef884235f0f34045c6741255910eeb026d28bfc6 SOURCES/nmstate-0.3.3.tar.gz -c3efe2931425e910002e11ff34ef102fbfa0b9de SOURCES/nmstate.gpg +d732a1ccb1dfc54741a9d602179c809c3223af3a SOURCES/nmstate-0.3.4.tar.gz +b5f872551d434e2c62b30d70471efaeede83ab44 SOURCES/nmstate.gpg diff --git a/SOURCES/BZ_1850698-dns-fix-remove-dns-config.patch b/SOURCES/BZ_1850698-dns-fix-remove-dns-config.patch deleted file mode 100644 index 337cc9d..0000000 --- a/SOURCES/BZ_1850698-dns-fix-remove-dns-config.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3333cb8bfa77fb208bb4f6f62dce770aa235bc2b Mon Sep 17 00:00:00 2001 -From: Fernando Fernandez Mancera -Date: Mon, 6 Jul 2020 13:45:19 +0200 -Subject: [PATCH] dns: fix remove dns config - -This patch is fixing the support of removing the dns config. - -Ref: https://bugzilla.redhat.com/1850698 - -Signed-off-by: Fernando Fernandez Mancera ---- - libnmstate/dns.py | 8 +++++--- - tests/integration/dns_test.py | 4 +++- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/libnmstate/dns.py b/libnmstate/dns.py -index 1ec0d81..e41220f 100644 ---- a/libnmstate/dns.py -+++ b/libnmstate/dns.py -@@ -181,9 +181,11 @@ class DnsState: - - def verify(self, cur_dns_state): - cur_dns = DnsState(des_dns_state=None, cur_dns_state=cur_dns_state,) -- if self.config.get(DNS.SERVER) != cur_dns.config.get( -- DNS.SERVER -- ) or self.config.get(DNS.SEARCH) != cur_dns.config.get(DNS.SEARCH): -+ if self.config.get(DNS.SERVER, []) != cur_dns.config.get( -+ DNS.SERVER, [] -+ ) or self.config.get(DNS.SEARCH, []) != cur_dns.config.get( -+ DNS.SEARCH, [] -+ ): - raise NmstateVerificationError( - format_desired_current_state_diff( - {DNS.KEY: self.config}, {DNS.KEY: cur_dns.config}, --- -2.25.4 - diff --git a/SOURCES/nmstate-0.3.3.tar.gz.asc b/SOURCES/nmstate-0.3.3.tar.gz.asc deleted file mode 100644 index 6c6aca6..0000000 --- a/SOURCES/nmstate-0.3.3.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE8f1XsqXpyNthgIbGbM3lj+QeKP8FAl7+AiYACgkQbM3lj+Qe -KP+Wsg/+JOLSvkt+ko1DKALIyo+5b/rjCoon/WIZ72K9mNFNq8xyltVNcv8Idoge -hAaPXXIVs1PGb40j7w4omHp3obsi2mmYZZyKK7+vWjKayTnOT77RpXAQ9H9WoQYB -fhky4iuCGEmSS/BAV+o5OC/V/AeJfdLiKx87AjpPBIzu3lOLWTt8pv9/9vA724vY -wjtyawcJJGfoQT+7//75D3E80uCWrPN+SnWwY61VO9t6sIQKvc8PAxRFHYcoPvp9 -6/8DXqwE3Q0P7LiuMtX5tmqXCM56b4qsivcnsGOodsVOPhOrtf0/7NxHIysKTxi/ -zEP+GKZzeUKYVx+o2+QPhkXOgQ2N1HinrqomslVtk+rVSKZRl8Wnk75CK+Q8O698 -cNeLC4qNvcEKkpJ/lsyt/3Mqe/yigFP9NQSpiMboBCgfQrsGdJ923FtyjIQzii/A -16CNASeXIgmCmHVdmYHngCsEps1GM2cujvSf9nzKRq7KaPhxZ1LK6ZjZHHFPBszW -cM9LnxqTIOO5ZY+T2PU1MOj9QdP20mzuK0zMaGB+m8aqZ3jy7xrJxnPxzbSyXhkJ -1nPylYCqZAf8rsGfRIVd74jCNS8zXnzDju0y4lMYUMmJPT3RfeRWLP3TtjAlnB7l -LFCSftCwqUp9osKoSrkQeRnf0Bh1ShAw2brr8xwQ9/WFfSW6lyc= -=vjzJ ------END PGP SIGNATURE----- diff --git a/SOURCES/nmstate-0.3.4.tar.gz.asc b/SOURCES/nmstate-0.3.4.tar.gz.asc new file mode 100644 index 0000000..ac2c220 --- /dev/null +++ b/SOURCES/nmstate-0.3.4.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEfUQ+BAINyWGvqJXerIciWuEsPqMFAl8a02UACgkQrIciWuEs +PqMSmg//T/2C0mP+zb1pnIfcPZvc8dlNgnvtTIN8EK23b6UvxrFYKuPmqRw+Dsir +N/9enPTUgQKAOtZs7BdtZlCmsaU2bWAF11UgRY+gcSkSVeG0j/kxHLG3sE4RbFiD +QPKJrqRE6m+ybTOiJ0oVXkR7f2i/AVmZE3+eZHn1TzHQoKZA8MJyExYWmk7wMkfG +KzE7jvZQ1M4Q6aZKxo4wjAkhAhFLio9HhWnl8z1bLpWWFVHqqMJ04QniDsepczCm +ISr6grG2TW6bS93lRCdDkS4yGCAYrwZ/5eyN5eOTd/et7FqG/ExFHdVaaro5I1W5 +cbOYyZ1cI/avA9vCWCkC7DUJOh3i5BzzhHaxS65qqpM7fiLIrHZhaLQaLByMO48d +zo1wDEwIyNvuP4bIVwRycuDhtcLnPs5QwVbfW4HKkn4ULO+inr3lJk8V3ZZ3Ghmz +qKCrpteJTK/yJl9N2MrXxPvYYe388m4A6GGSVml4mYCd2ZMBrQ8k8fSPdlodmzVJ +J5gpeJRqm9sdrbv7tmuDfNOjAu0o9MP0/OSA0Lb5ho3pyylGnhsZ7Zkwbn2U/1b2 +zgPmVWJqRhjq01VgderCOerxow7OvetNicrNg/9e7+eFAHV7VUowdKf3vCyk0+nl +WGeZLxi21w2Q2RH1ThPo6uMxL3pIp7dsbVrqM7oLpUoZzGtFnq8= +=4Hsb +-----END PGP SIGNATURE----- diff --git a/SPECS/nmstate.spec b/SPECS/nmstate.spec index d207863..eff407c 100644 --- a/SPECS/nmstate.spec +++ b/SPECS/nmstate.spec @@ -3,15 +3,14 @@ %define libname libnmstate Name: nmstate -Version: 0.3.3 -Release: 2%{?dist} +Version: 0.3.4 +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 -Patch1: BZ_1850698-dns-fix-remove-dns-config.patch BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -28,7 +27,7 @@ provider support on the southbound. %package -n python3-%{libname} Summary: nmstate Python 3 API library -Requires: NetworkManager-libnm >= 1:1.22.16 +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 @@ -82,6 +81,12 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Sat Jul 25 2020 Fernando Fernandez Mancera - 0.3.4-1 +- Upgrade to 0.3.4 + +* Fri Jul 24 2020 Gris Ge - 0.3.3-3 +- Allowing child been marked absent. RHBZ#1859148 + * Mon Jul 06 2020 Fernando Fernandez Mancera - 0.3.3-2 - Fix bug 1850698