Fix C10S build and upgrade to 2.2.27

Signed-off-by: Gris Ge <fge@redhat.com>

.gitignore

@@ -109,3 +109,9 @@
 /nmstate-2.2.21.tar.gz
 /nmstate-2.2.21.tar.gz.asc
 /nmstate-vendor-2.2.21.tar.xz
+/nmstate-2.2.26.tar.gz
+/nmstate-2.2.26.tar.gz.asc
+/nmstate-vendor-2.2.26.tar.xz
+/nmstate-2.2.27.tar.gz
+/nmstate-2.2.27.tar.gz.asc
+/nmstate-vendor-2.2.27.tar.xz

0001-Workaround-for-Fedora-rust-packaging.patch

@@ -1,11 +0,0 @@
-diff -Nur nmstate-2.2.21.orig/rust/src/lib/Cargo.toml nmstate-2.2.21/rust/src/lib/Cargo.toml
---- nmstate-2.2.21.orig/rust/src/lib/Cargo.toml	2023-12-14 19:21:53.000000000 +0800
-+++ nmstate-2.2.21/rust/src/lib/Cargo.toml	2023-12-15 19:04:02.936926574 +0800
-@@ -61,6 +61,6 @@
- 
- [features]
- default = ["query_apply", "gen_conf", "gen_revert"]
--query_apply = ["nispor", "nix", "zbus"]
-+query_apply = ["dep:nispor", "dep:nix", "dep:zbus"]
- gen_conf = []
- gen_revert = []

nmstate.spec

@@ -2,7 +2,7 @@
 %define libname libnmstate
 
 Name:           nmstate
-Version:        2.2.21
+Version:        2.2.27
 Release:        %autorelease
 Summary:        Declarative network manager API
 License:        Apache-2.0 AND LGPL-2.1-or-later
@@ -11,9 +11,6 @@ Source0:        %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.g
 Source1:        %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc
 Source2:        https://nmstate.io/nmstate.gpg
 Source3:        %{url}/releases/download/v%{version}/%{srcname}-vendor-%{version}.tar.xz
-# https://github.com/nmstate/nmstate/pull/2497
-Patch1:         0001-Workaround-for-Fedora-rust-packaging.patch
-BuildRequires:  patchelf
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  gnupg2
@@ -30,7 +27,7 @@ BuildRequires:  (crate(ctrlc/default) >= 3.2 with crate(ctrlc/default) < 4.0)
 BuildRequires:  (crate(env_logger/default) >= 0.10 with crate(env_logger/default) < 0.11)
 BuildRequires:  (crate(libc/default) >= 0.2 with crate(libc/default) < 0.3)
 BuildRequires:  (crate(log/default) >= 0.4 with crate(log/default) < 0.5)
-BuildRequires:  (crate(nispor/default) >= 1.2.12 with crate(nispor/default) < 2.0)
+BuildRequires:  (crate(nispor/default) >= 1.2.17 with crate(nispor/default) < 2.0)
 BuildRequires:  (crate(serde/default) >= 1.0 with crate(serde/default) < 2.0)
 BuildRequires:  (crate(serde/derive) >= 1.0 with crate(serde/derive) < 2.0)
 BuildRequires:  (crate(serde_json/default) >= 1.0 with crate(serde_json/default) < 2.0)
@@ -40,6 +37,7 @@ BuildRequires:  (crate(uuid/v5) >= 1.1 with crate(uuid/v5) < 2.0)
 BuildRequires:  (crate(zbus/default) >= 1.9 with crate(zbus/default) < 2.0)
 BuildRequires:  (crate(zvariant/default) >= 2.10 with crate(zvariant/default) < 3.0)
 BuildRequires:  (crate(nix/default) >= 0.26 with crate(nix/default) < 0.27)
+BuildRequires:  (crate(toml/default) >= 0.8 with crate(toml/default) < 0.9)
 %endif
 
 %description
@@ -154,12 +152,13 @@ which use "%{name}" crate with gen_revert feature.
 gpg2 --import --import-options import-export,import-minimal \
     %{SOURCE2} > ./gpgkey-mantainers.gpg
 gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0}
-%autosetup -p1
+
+%autosetup -n %{name}-%{version_no_tilde} -p1 %{?rhel:-a3}
 
 pushd rust
-rm .cargo/config.toml
 %if 0%{?rhel}
-%cargo_prep -V 3
+mv ../vendor ./
+%cargo_prep -v vendor
 %else
 %cargo_prep
 %endif
@@ -168,6 +167,11 @@ popd
 %build
 pushd rust
 %cargo_build
+%cargo_license_summary
+%{cargo_license} > ../LICENSE.dependencies
+%if 0%{?rhel}
+%cargo_vendor_manifest
+%endif
 popd
 
 pushd rust/src/python
@@ -180,8 +184,6 @@ env SKIP_PYTHON_INSTALL=1 \
     LIBDIR=%{_libdir} \
     SYSCONFDIR=%{_sysconfdir} \
     %make_install
-patchelf --set-soname libnmstate.so.2 \
-    %{buildroot}/%{_libdir}/libnmstate.so.%{version}
 
 pushd rust/src/python
 %py3_install
@@ -199,6 +201,10 @@ popd
 
 %files
 %doc README.md
+%license LICENSE.dependencies
+%if 0%{?rhel}
+%license rust/cargo-vendor.txt
+%endif
 %doc examples/
 %{_mandir}/man8/nmstatectl.8*
 %{_mandir}/man8/nmstate-autoconf.8*

sources

@@ -1,4 +1,4 @@
-SHA512 (nmstate-2.2.21.tar.gz) = 5b367547064eba4f76bb1ccccab517bf67bf8b9f6d1afd9041ccba075863e168b2f29719276f4cc8eaf6e1fe6e1ce941828f79d2f7bd08b187e09c1eb3156d22
-SHA512 (nmstate-2.2.21.tar.gz.asc) = 9dc40cc990fdd12ec5f776a36c99c75a84dfc961207b8080de43e7564f38e9f0cada8d8e786e6ff4b8ca291446dc70920b6c966734d510e2293c259d68d3fa5d
+SHA512 (nmstate-2.2.27.tar.gz) = 66688426e5c47c4b9571e0fab96a1a161de5efb3c2a7448f43c96b5d6ee9bd8dc480408455025cc5deda718824d2558f120ba1802b0ac95c8e1105ec7bacfc41
+SHA512 (nmstate-2.2.27.tar.gz.asc) = 1948ed8adbf33a1e1124fca0b1907df0f958ba35916807bead88ab1d3486005ee8a0bfe74625382225f065ea1d3e284d7ecb107b605c529669af6c453843addd
+SHA512 (nmstate-vendor-2.2.27.tar.xz) = 636829fb16bef5571f01888dfe3c6105f9056eeb84713f010ff41be4ea7247f33ddfc63b5d168020a683efc12471286ffa09c2c807668bdfc2a064aa49cb68c2
 SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3
-SHA512 (nmstate-vendor-2.2.21.tar.xz) = 9da67a516657b87d82318775ed47b826089cd970f00c1e62aa7a9a5898cd66c54cec400561f2c9704916e5c618bb6a63a41abacc33c5d0d2c647c86eef116294