rpms/nmstate
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade to 2.2.26

Browse source 
Signed-off-by: Gris Ge <fge@redhat.com>
This commit is contained in:
Gris Ge 2024-03-18 13:31:57 +08:00
commit 130a58c8a2
4 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -109,3 +109,6 @@
/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

11
0001-Workaround-for-Fedora-rust-packaging.patch
View file

@ -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 = []

22
nmstate.spec
View file

@ -2,7 +2,7 @@
%define libname libnmstate
Name: nmstate
Version: 2.2.21
Version: 2.2.26
Release: %autorelease
Summary: Declarative network manager API
License: Apache-2.0 AND LGPL-2.1-or-later
@ -11,8 +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
@ -30,7 +28,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 +38,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 +153,12 @@ 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
%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
@ -199,6 +203,10 @@ popd
%files
%doc README.md
%license LICENSE.dependencies
%if 0%{?rhel}
%license cargo-vendor.txt
%endif
%doc examples/
%{_mandir}/man8/nmstatectl.8*
%{_mandir}/man8/nmstate-autoconf.8*

6
sources
View file

@ -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.26.tar.gz) = 52ff3f35ea514018be2dec5d83cc42ad3ed13cf93c6ac72b838ff4218e51d364abbc3f0b33feb9971cda2bc9eb8f76374c0fe66b614f311a71196900117a83fd
SHA512 (nmstate-2.2.26.tar.gz.asc) = a1cebb3221a7222188b41e348201364189b0c3b35de4964ec5fb83a13b0976bbb17fc831662bfbbf0b9461288c146551c56c6d57862dc4333d848f19ce4194e5
SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3
SHA512 (nmstate-vendor-2.2.21.tar.xz) = 9da67a516657b87d82318775ed47b826089cd970f00c1e62aa7a9a5898cd66c54cec400561f2c9704916e5c618bb6a63a41abacc33c5d0d2c647c86eef116294
SHA512 (nmstate-vendor-2.2.26.tar.xz) = 80cbb3e73a55ae602edb3f4538ef87f1b441d149e7bed53fad60828f811d19450d4882a86521c0147d5d9a932c6d5b9595803d919ab1bc7622d29a36c289446a