From 2ddb7b6af2512d2748da1f2dd73d5ba5ac5cdf95 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Mon, 31 Aug 2020 11:06:13 +0200 Subject: [PATCH 1/6] Update to 0.3.5 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cbe8602..3dc0181 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,5 @@ /nmstate-0.3.3.tar.gz.asc /nmstate-0.3.4.tar.gz /nmstate-0.3.4.tar.gz.asc +/nmstate-0.4.0.tar.gz +/nmstate-0.4.0.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 3e76ad9..1d5972e 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,8 +3,8 @@ %define libname libnmstate Name: nmstate -Version: 0.3.4 -Release: 2%{?dist} +Version: 0.3.5 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -79,6 +79,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Mon Aug 31 2020 Fernando Fernandez Mancera - 0.3.5-1 +- Update to 0.3.5 + * Tue Jul 28 2020 Fedora Release Engineering - 0.3.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 320b989..376d7f9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (nmstate-0.3.4.tar.gz) = e367dd79e294ce260c213cc1f62880dfd58b8e2484c236b215fb0dbb1d4d679b90cde0b3f70444a45182747602ad71772ab5bd1b6eb124365f92469c091b6444 -SHA512 (nmstate-0.3.4.tar.gz.asc) = a895965a5bc58f4a6ee1ed4284aaaad4943b4f8b7f32781979584a996554ac712c2e3bb1683b569f793bcd1b093f55ddb735c0222e8cf64ad2fdb0be9f9a1ead SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 +SHA512 (nmstate-0.4.0.tar.gz) = edbd9663178004786287502c10ecafd284de2b96d874b1f65a3c93f9898358341eddb2bf89fc1d989e612351e6cfbe0ce47a643c8be9139a5ac7354047057e3a +SHA512 (nmstate-0.4.0.tar.gz.asc) = 32e99c7acd93a93fab5d0e454d6ea2b87107d9a4486d879bee13fd96a32117bdccc45c7aea9fd826b4ddf5e1e7261cfd98c60b1d21a7bebbd9c894f4a42dcb23 From 65ff7f7c6bcd8bf92cb49d8111c163f4cb1f0b64 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Mon, 31 Aug 2020 11:14:54 +0200 Subject: [PATCH 2/6] Fix sources Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3dc0181..2e30dec 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,5 @@ /nmstate-0.3.4.tar.gz.asc /nmstate-0.4.0.tar.gz /nmstate-0.4.0.tar.gz.asc +/nmstate-0.3.5.tar.gz +/nmstate-0.3.5.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 1d5972e..718953c 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -4,7 +4,7 @@ Name: nmstate Version: 0.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -79,6 +79,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Mon Aug 31 2020 Fernando Fernandez Mancera - 0.3.5-2 +- Fix sources + * Mon Aug 31 2020 Fernando Fernandez Mancera - 0.3.5-1 - Update to 0.3.5 diff --git a/sources b/sources index 376d7f9..a0525cb 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 -SHA512 (nmstate-0.4.0.tar.gz) = edbd9663178004786287502c10ecafd284de2b96d874b1f65a3c93f9898358341eddb2bf89fc1d989e612351e6cfbe0ce47a643c8be9139a5ac7354047057e3a -SHA512 (nmstate-0.4.0.tar.gz.asc) = 32e99c7acd93a93fab5d0e454d6ea2b87107d9a4486d879bee13fd96a32117bdccc45c7aea9fd826b4ddf5e1e7261cfd98c60b1d21a7bebbd9c894f4a42dcb23 +SHA512 (nmstate-0.3.5.tar.gz) = a62ce4dd6ee5f04d5e962865df633da0247c0e859881d7476d2fe71e3625b32d7c42721aff1fdcc6a5131e8c7d1a05f32f908c3b55b56875f8096a65285fdc8a +SHA512 (nmstate-0.3.5.tar.gz.asc) = 6b57ee988fa1802ef67c7c3767538f34b62592b7af9f3d1b9ce8d6dc1b717d4916c6aafb543d85b2a9db9ec7351ec6151324cc4bf32b302add9b34dbe2ef34bc From 6962c3fb31b324919f2ba51975dfb0426af1cbb5 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Thu, 22 Oct 2020 10:45:52 +0200 Subject: [PATCH 3/6] Update to 0.3.6 Signed-off-by: Fernando Fernandez Mancera --- .gitignore | 2 ++ nmstate.spec | 15 +++++++++++++-- sources | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2e30dec..7872f27 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,5 @@ /nmstate-0.4.0.tar.gz.asc /nmstate-0.3.5.tar.gz /nmstate-0.3.5.tar.gz.asc +/nmstate-0.3.6.tar.gz +/nmstate-0.3.6.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 718953c..16ee94d 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,8 +3,8 @@ %define libname libnmstate Name: nmstate -Version: 0.3.5 -Release: 2%{?dist} +Version: 0.3.6 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -54,12 +54,18 @@ gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgke gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %setup -q +%preun +%systemd_preun nmstate-varlink.service + %build %py3_build %install %py3_install +%post +%systemd_post nmstate-varlink.service + %files %doc README.md %doc examples/ @@ -73,12 +79,17 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{srcname}-*.egg-info/ %exclude %{python3_sitelib}/%{libname}/plugins/nmstate_plugin_* %exclude %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_* +%{_unitdir}/nmstate-varlink.service %files -n nmstate-plugin-ovsdb %{python3_sitelib}/%{libname}/plugins/nmstate_plugin_ovsdb* %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Thu Oct 22 2020 Fernando Fernandez Mancera - 0.3.6-1 +- Update to 0.3.6 +- Sync. with upstream specfile + * Mon Aug 31 2020 Fernando Fernandez Mancera - 0.3.5-2 - Fix sources diff --git a/sources b/sources index a0525cb..09ebdb8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 -SHA512 (nmstate-0.3.5.tar.gz) = a62ce4dd6ee5f04d5e962865df633da0247c0e859881d7476d2fe71e3625b32d7c42721aff1fdcc6a5131e8c7d1a05f32f908c3b55b56875f8096a65285fdc8a -SHA512 (nmstate-0.3.5.tar.gz.asc) = 6b57ee988fa1802ef67c7c3767538f34b62592b7af9f3d1b9ce8d6dc1b717d4916c6aafb543d85b2a9db9ec7351ec6151324cc4bf32b302add9b34dbe2ef34bc +SHA512 (nmstate-0.3.6.tar.gz) = 9f0113080afe2ae87f6c200d00feb3265bec13db1b6332a7c7a95f9ad0a22c2b44ad8ebc7d3dcfa4a6ce9e3fa80aa5353a404c6530f26747a402c7fba2f239ae +SHA512 (nmstate-0.3.6.tar.gz.asc) = 07c388a46e9711e6513643b9871e46272969e9bfdae1fc491a6e368188d90bf4355bd093496c24b4ef04f6c04a39c16d4e8ba1d3871b28c8f6233cd0b503e4e1 From 822de5c4cb24cbf5e67ddd631597e89bc9808faf Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Thu, 22 Oct 2020 11:03:12 +0200 Subject: [PATCH 4/6] Add python3dist(varlink) dependency Signed-off-by: Fernando Fernandez Mancera --- nmstate.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nmstate.spec b/nmstate.spec index 16ee94d..06fa311 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -4,7 +4,7 @@ Name: nmstate Version: 0.3.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -37,6 +37,7 @@ Recommends: NetworkManager-config-server # required for OVS and team support Suggests: NetworkManager-ovs Suggests: NetworkManager-team +Requires: python3dist(varlink) %package -n nmstate-plugin-ovsdb Summary: nmstate plugin for OVS database manipulation @@ -79,13 +80,15 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{srcname}-*.egg-info/ %exclude %{python3_sitelib}/%{libname}/plugins/nmstate_plugin_* %exclude %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_* -%{_unitdir}/nmstate-varlink.service %files -n nmstate-plugin-ovsdb %{python3_sitelib}/%{libname}/plugins/nmstate_plugin_ovsdb* %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Thu Oct 22 2020 Fernando Fernandez Mancera - 0.3.6-2 +- Add python3dist(varlink) dependency + * Thu Oct 22 2020 Fernando Fernandez Mancera - 0.3.6-1 - Update to 0.3.6 - Sync. with upstream specfile From 0e2c1c61fd951f92c0de6b1ce763fd96fa2de918 Mon Sep 17 00:00:00 2001 From: Wen Liang Date: Mon, 5 Apr 2021 11:11:39 -0400 Subject: [PATCH 5/6] Update to 0.3.7 Signed-off-by: Wen Liang --- .gitignore | 2 ++ nmstate.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7872f27..8eb5a95 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,5 @@ /nmstate-0.3.5.tar.gz.asc /nmstate-0.3.6.tar.gz /nmstate-0.3.6.tar.gz.asc +/nmstate-0.3.7.tar.gz +/nmstate-0.3.7.tar.gz.asc diff --git a/nmstate.spec b/nmstate.spec index 06fa311..0cd4e3d 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -3,8 +3,8 @@ %define libname libnmstate Name: nmstate -Version: 0.3.6 -Release: 2%{?dist} +Version: 0.3.7 +Release: 1%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -86,6 +86,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Mon Apr 05 2021 Wen Liang - 0.3.7-1 +- Update to 0.3.7 + * Thu Oct 22 2020 Fernando Fernandez Mancera - 0.3.6-2 - Add python3dist(varlink) dependency diff --git a/sources b/sources index 09ebdb8..92c6080 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ +SHA512 (nmstate-0.3.7.tar.gz) = 065ec60fe0cd0b5af485f0694ae59e41611dfd2c2a289fa0871d1e931e4259ec1827b8635009c8f88a5522fc52a9999e9f83a2332e6e989f1ebedb33667d88e9 +SHA512 (nmstate-0.3.7.tar.gz.asc) = 07dec7c65224f9debcec64652c93ee26739d7f141b4e95f7f975565453acbaac6c95b1b3b201014eec0c1eaa785216c8fc658b23f963cb3646b54fe3ca61ace5 SHA512 (nmstate.gpg) = af6af2024ea46b5c87c6c71d4be278ce4eed58c1783385619987fe8e254eb599f9b218897e7db67050b0e9f7101b206561f63218fda18a0d95103a04682c8309 -SHA512 (nmstate-0.3.6.tar.gz) = 9f0113080afe2ae87f6c200d00feb3265bec13db1b6332a7c7a95f9ad0a22c2b44ad8ebc7d3dcfa4a6ce9e3fa80aa5353a404c6530f26747a402c7fba2f239ae -SHA512 (nmstate-0.3.6.tar.gz.asc) = 07c388a46e9711e6513643b9871e46272969e9bfdae1fc491a6e368188d90bf4355bd093496c24b4ef04f6c04a39c16d4e8ba1d3871b28c8f6233cd0b503e4e1 From 32050d1ac81f602f858b5a010cbbe0d81e059e70 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Mon, 19 Apr 2021 14:31:17 +0200 Subject: [PATCH 6/6] Fix installation of nmstate-varlink.service Signed-off-by: Fernando Fernandez Mancera --- nmstate.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nmstate.spec b/nmstate.spec index 0cd4e3d..9cbf73f 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -4,7 +4,7 @@ Name: nmstate Version: 0.3.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -15,6 +15,8 @@ BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: gnupg2 +BuildRequires: systemd-devel +BuildRequires: systemd-rpm-macros Requires: python3-setuptools Requires: python3-%{libname} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -63,6 +65,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %install %py3_install +mkdir -p %{buildroot}%{_unitdir} +install -p -m 644 %{buildroot}%{python3_sitelib}/nmstatectl/nmstate-varlink.service \ + %{buildroot}%{_unitdir}/nmstate-varlink.service %post %systemd_post nmstate-varlink.service @@ -73,6 +78,7 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{_mandir}/man8/nmstatectl.8* %{python3_sitelib}/nmstatectl %{_bindir}/nmstatectl +%{_unitdir}/nmstate-varlink.service %files -n python3-%{libname} %license LICENSE @@ -86,6 +92,9 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} %{python3_sitelib}/%{libname}/plugins/__pycache__/nmstate_plugin_ovsdb* %changelog +* Mon Apr 19 2021 Fernando Fernandez Mancera - 0.3.7-2 +- Fix nmstate-varlink service installation. + * Mon Apr 05 2021 Wen Liang - 0.3.7-1 - Update to 0.3.7