From d4279f01b49226e8c8ce2d1922462cec8c33917a Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Tue, 21 May 2024 14:46:24 +0800 Subject: [PATCH 1/4] update to nmstate-2.2.27-2.src.rpm Signed-off-by: Zhao Hang --- dist | 2 +- download | 6 ++--- nmstate.gpg | 51 +++++++++++++++++++++++++++++++++++++-- nmstate.spec | 68 +++++++++++++++++++++++----------------------------- 4 files changed, 83 insertions(+), 44 deletions(-) diff --git a/dist b/dist index 0b1f29d..9b27344 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an9_3 +an9_4 diff --git a/download b/download index ecdf951..a3989c4 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ -df4f43b459f8c1709f9e8a8346eb2492 nmstate-2.2.24.tar.gz -d22d96ea1b55571b8fe00ad31d1f52e4 nmstate-2.2.24.tar.gz.asc -94264cb39b7fe857df410507f086da11 nmstate-vendor-2.2.24.tar.xz +61c5cf7084d65050157e7ee5f8272693 nmstate-2.2.27.tar.gz +2bfdac8b640cfa871582347dbeb1e81b nmstate-2.2.27.tar.gz.asc +571e59fb9feb5e5eef0513f35caf868a nmstate-vendor-2.2.27.tar.xz diff --git a/nmstate.gpg b/nmstate.gpg index 3b3a89b..05ff659 100644 --- a/nmstate.gpg +++ b/nmstate.gpg @@ -94,6 +94,53 @@ V95yJtLnCnFdKlnyzT9HDepWfG8266hgBD+OQ/Kvhx6SmIImCgMOtcDW+fAz3X5L YjVo4IPCmJLRb9b8kPX9JuJWDnYWd0SOB00ImaGeXd/kV8W30Lss1OeQ7iya/Ej7 t878uw4RVPKsgCQTWKOWhC0r0DNE/bskGrWZAJGC3M7yqzAErxiIOBKRwH2haegT syMyW5sNgF43zvxzEHACZnbx+qzHYf+SeQg4pRxLlZj6/Udc3hM/j1cGkMMiwl23 -i2QY7dEEs/uMRtq8C8kSWg== -=259x +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 +KfYnetRPLeXiMqWKTUaImA== +=a0yN -----END PGP PUBLIC KEY BLOCK----- diff --git a/nmstate.spec b/nmstate.spec index 34e912d..356f518 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -1,11 +1,10 @@ %?python_enable_dependency_generator %define srcname nmstate %define libname libnmstate -%define anolis_release .0.1 Name: nmstate -Version: 2.2.24 -Release: 1%{anolis_release}%{?dist} +Version: 2.2.27 +Release: 2%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -17,9 +16,6 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: gnupg2 BuildRequires: rust-toolset -%ifarch loongarch64 -BuildRequires: cargo-vendored-nix -%endif BuildRequires: pkg-config BuildRequires: systemd @@ -78,14 +74,6 @@ This package contains the C binding development files of nmstate. %description -n python3-%{libname} This package contains the Python 3 library for Nmstate. -%package doc -Summary: Documents for %{name} -BuildArch: noarch -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description doc -Doc pages for %{name}. - %prep gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgkey-mantainers.gpg gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} @@ -94,11 +82,6 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} pushd rust # Source3 is vendored dependencies %cargo_prep -V 3 -%ifarch loongarch64 -rm -rf vendor/nix* -rm -f Cargo.lock -ln -s %{_datadir}/cargo/vendor/nix* vendor/ -%endif popd @@ -107,7 +90,7 @@ pushd rust/src/python %py3_build popd pushd rust -%cargo_build --ignore-rust-version +%cargo_build popd %install @@ -123,6 +106,7 @@ popd %files +%doc README.md %doc examples/ %{_mandir}/man8/nmstate.service.8* %{_mandir}/man8/nmstatectl.8* @@ -157,37 +141,45 @@ popd %postun libs /sbin/ldconfig -%files doc -%doc README.md - %changelog -* Mon May 06 2024 Xiaoping Liu - 2.2.24-1.0.1 -- Add doc sub package -- Support loongarch64 (Liwei Ge) -- remove BuildRequires cargo-vendored-libc +* Fri Apr 05 2024 Fernando Fernandez Mancera - 2.2.27-2 +- Rebuild to use the right target + +* Fri Apr 05 2024 Fernando Fernandez Mancera - 2.2.27-1 +- Upgrade to 2.2.27-1 + +* Thu Feb 22 2024 Fernando Fernandez Mancera - 2.2.25-1 +- Upgrade to 2.2.25 * Thu Feb 08 2024 Gris Ge - 2.2.24-1 - Upgrade to 2.2.24 -- Fix modification of ipsec connection. RHEL-23008 -- Fix nmstate.service on applied file. RHEL-24718 -* Wed Jan 17 2024 Fernando Fernandez Mancera - 2.2.23-1 -- Upgrade to 2.2.23 -- Support type, hostaddrfamily and clientaddrfamily options in IPSec. RHEL-21354 +* Thu Jan 18 2024 Fernando Fernandez Mancera - 2.2.23-1 +- Upgrade to 2.2.23. * Fri Jan 05 2024 Gris Ge - 2.2.22-1 -- Use hash value to mark applied yml files at nmstatectl service. RHEL-19778 -- Support SRIOV VLAN protocol. RHEL-16487 +- Upgrade to 2.2.22. * Tue Dec 19 2023 Gris Ge - 2.2.21-2 -- Fix `ipsec-interface` option. RHEL-19322 +- Fix `ipsec-interface` option. RHEL-17403 * Fri Dec 15 2023 Íñigo Huguet - 2.2.21-1 -- Upgrade to 2.2.21 -- Add Custom DPD Parameter - Authby and Interface. RHEL-19322 +- Upgrade to 2.2.21. + +* Thu Nov 30 2023 Gris Ge - 2.2.20-1 +- Upgrade to 2.2.20. * Wed Nov 15 2023 Gris Ge - 2.2.19-1 -- Fix static route converting auto IP interface to static IP. RHEL-16324 +- Upgrade to 2.2.19. + +* Thu Nov 02 2023 Gris Ge - 2.2.18-1 +- Upgrade to 2.2.18. + +* Thu Sep 21 2023 Gris Ge - 2.2.16-1 +- Upgrade to 2.2.16. + +* Mon Sep 04 2023 Gris Ge - 2.2.15-3 +- Rebuild for RHEL 9.4. * Wed Aug 30 2023 Gris Ge - 2.2.15-2 - Rebuild for RHEL 9.3. -- Gitee From 471e9efafdcc37f2e8ffeace2895a0d3264265e4 Mon Sep 17 00:00:00 2001 From: liuxiaoping Date: Mon, 28 Nov 2022 17:52:04 +0800 Subject: [PATCH 2/4] spec: add doc sub package --- nmstate.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/nmstate.spec b/nmstate.spec index 356f518..c9f8ef7 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -1,10 +1,11 @@ %?python_enable_dependency_generator %define srcname nmstate %define libname libnmstate +%define anolis_release .0.1 Name: nmstate Version: 2.2.27 -Release: 2%{?dist} +Release: 2%{anolis_release}%{?dist} Summary: Declarative network manager API License: LGPLv2+ URL: https://github.com/%{srcname}/%{srcname} @@ -74,6 +75,14 @@ This package contains the C binding development files of nmstate. %description -n python3-%{libname} This package contains the Python 3 library for Nmstate. +%package doc +Summary: Documents for %{name} +BuildArch: noarch +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description doc +Doc pages for %{name}. + %prep gpg2 --import --import-options import-export,import-minimal %{SOURCE2} > ./gpgkey-mantainers.gpg gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} @@ -106,7 +115,6 @@ popd %files -%doc README.md %doc examples/ %{_mandir}/man8/nmstate.service.8* %{_mandir}/man8/nmstatectl.8* @@ -141,7 +149,13 @@ popd %postun libs /sbin/ldconfig +%files doc +%doc README.md + %changelog +* Tue May 21 2024 Xiaoping Liu - 2.2.27-2.0.1 +- Add doc sub package + * Fri Apr 05 2024 Fernando Fernandez Mancera - 2.2.27-2 - Rebuild to use the right target -- Gitee From 2ac31e710dd9c7880014e8bb0ef35179a9227adc Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Tue, 13 Dec 2022 20:03:40 +0800 Subject: [PATCH 3/4] vendor: support loongarch64 --- nmstate.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nmstate.spec b/nmstate.spec index c9f8ef7..2d3c8fe 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -17,6 +17,10 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: gnupg2 BuildRequires: rust-toolset +%ifarch loongarch64 +BuildRequires: cargo-vendored-libc +BuildRequires: cargo-vendored-nix +%endif BuildRequires: pkg-config BuildRequires: systemd @@ -91,6 +95,12 @@ gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} pushd rust # Source3 is vendored dependencies %cargo_prep -V 3 +%ifarch loongarch64 +rm -rf vendor/libc* vendor/nix* +rm -f Cargo.lock +ln -s %{_datadir}/cargo/vendor/libc* vendor/ +ln -s %{_datadir}/cargo/vendor/nix* vendor/ +%endif popd @@ -155,6 +165,7 @@ popd %changelog * Tue May 21 2024 Xiaoping Liu - 2.2.27-2.0.1 - Add doc sub package +- Support loongarch64 (Liwei Ge) * Fri Apr 05 2024 Fernando Fernandez Mancera - 2.2.27-2 - Rebuild to use the right target -- Gitee From 085da09a53f06de82ec2829b86df90ff65e6ea67 Mon Sep 17 00:00:00 2001 From: Bo Ren Date: Tue, 2 Jan 2024 10:41:34 +0800 Subject: [PATCH 4/4] remove BuildRequires cargo-vendored-libc Signed-off-by: Bo Ren --- nmstate.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nmstate.spec b/nmstate.spec index 2d3c8fe..bb68ddf 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -18,7 +18,6 @@ BuildRequires: python3-setuptools BuildRequires: gnupg2 BuildRequires: rust-toolset %ifarch loongarch64 -BuildRequires: cargo-vendored-libc BuildRequires: cargo-vendored-nix %endif BuildRequires: pkg-config @@ -96,9 +95,8 @@ pushd rust # Source3 is vendored dependencies %cargo_prep -V 3 %ifarch loongarch64 -rm -rf vendor/libc* vendor/nix* +rm -rf vendor/nix* rm -f Cargo.lock -ln -s %{_datadir}/cargo/vendor/libc* vendor/ ln -s %{_datadir}/cargo/vendor/nix* vendor/ %endif @@ -166,6 +164,7 @@ popd * Tue May 21 2024 Xiaoping Liu - 2.2.27-2.0.1 - Add doc sub package - Support loongarch64 (Liwei Ge) +- remove BuildRequires cargo-vendored-libc * Fri Apr 05 2024 Fernando Fernandez Mancera - 2.2.27-2 - Rebuild to use the right target -- Gitee