rpms/nmstate
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Upgrade to 2.2.36

Browse Source 
Removed Fedora specific rpm spec lines

Signed-off-by: Gris Ge <fge@redhat.com>
This commit is contained in:
Gris Ge 2024-09-24 17:31:52 +08:00
parent 3c41c6ed53
commit 12723c54af
4 changed files with 8 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -132,3 +132,6 @@
/nmstate-2.2.35.tar.gz
/nmstate-2.2.35.tar.gz.asc
/nmstate-vendor-2.2.35.tar.xz
/nmstate-2.2.36.tar.gz
/nmstate-2.2.36.tar.gz.asc
/nmstate-vendor-2.2.36.tar.xz

16
nmstate-2.2.34.tar.gz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEESP1vrlFad7SENoIch4lWe4cVzrwFAmarg8AACgkQh4lWe4cV
zrynSRAAnIrhqb4B3Lbbfpq9R1QN45x7j6rQTTAMhstAecJ0T9mYv4yxYO3IRcG/
F5QW2/mzEOJk/3pEMkq2qWqFL8Jur2+mTpNjG3PU42lLnh3S2Em7CYSjlGZ+MMyc
tBvYBtxr05xSU4Avhc1txTrl60gU3CobcyyoGjPsyw/uAuMRcLwtXnYc5yrlq8dC
gvW6ixdGGzNnni4gUM4UIgrT+ZTYZfX72VoNkQilO5RV8lrCcDLyX83gQpDw4SAD
W94R0L/f9vOVrxRPeMyNnTigY0PlJdB13qQd+J29nksVCFGlEGYdkG4mPo7MmmEt
5JXuR0Mwf7E4oYZK/N1UC8fSKsuAhs9KjISK2raFPuo1nBHQNc/iisDs7lpgYzfK
8NCQhK08df59JtUiLcY4KaJnVjPG8ESxFgODDtmJJGnaWSvvYvvqQ/MnLHswMPjM
LGRMZO5Uit9Wjk15ca5jyYy6z4lboi8QIcU6QvbG0cDxIZmMIq20TQdVNO3Qv/DF
+SvElTGxnavwsl7qLcF2Nr3/wFPK0vxiYb7xa+/wUIJA6bKubLM/TqsYHqy7Vjpx
o7F2sKGaoNTv7eeFsKGhUFIRkQz/5q7cfs+5B93rL20ZczUpu85q9dgsgDbvAVaw
zAfhRkO6jiXQN8yB/O0/Z7khGQKPG9p2ZUUwJ4gIFcgb0e1jyYs=
=FrJn
-----END PGP SIGNATURE-----

107
nmstate.spec
View File

@ -2,7 +2,7 @@
%define libname libnmstate
Name: nmstate
Version: 2.2.35
Version: 2.2.36
Release: %autorelease
Summary: Declarative network manager API
License: Apache-2.0 AND LGPL-2.1-or-later
@ -11,37 +11,13 @@ 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
Requires: (nmstate-libs%{?_isa} = %{version}-%{release} if nmstate-libs)
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: gnupg2
BuildRequires: systemd-devel
BuildRequires: systemd-rpm-macros
%if 0%{?rhel}
BuildRequires: rust-toolset
%else
BuildRequires: rust-packaging
BuildRequires: (crate(clap/cargo) >= 3.1 with crate(clap/cargo) < 4.0)
BuildRequires: (crate(clap/default) >= 3.1 with crate(clap/default) < 4.0)
BuildRequires: (crate(chrono/default) >= 0.4 with crate(chrono/default) < 0.5)
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(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)
BuildRequires: (crate(serde_yaml/default) >= 0.9 with crate(serde_yaml/default) < 1.0)
BuildRequires: (crate(uuid/v4) >= 1.1 with crate(uuid/v4) < 2.0)
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)
BuildRequires: (crate(tokio/default) >= 1.3 with crate(tokio/default) < 2.0)
BuildRequires: (crate(tokio/net) >= 1.3 with crate(tokio/net) < 2.0)
BuildRequires: (crate(tokio/rt) >= 1.3 with crate(tokio/rt) < 2.0)
BuildRequires: (crate(tokio/signal) >= 1.3 with crate(tokio/signal) < 2.0)
%endif
%description
Nmstate is a library with an accompanying command line tool that manages host
@ -100,57 +76,6 @@ License: Apache-2.0
%description -n python3-%{libname}
This package contains the Python 3 library for Nmstate.
%if ! 0%{?rhel}
%package -n rust-%{name}-devel
Summary: Rust crate of nmstate
BuildArch: noarch
License: Apache-2.0
%description -n rust-%{name}-devel
This package contains library source intended for building other packages
which use "%{name}" crate.
%package -n rust-%{name}+default-devel
Summary: Rust crate of nmstate with default feature
BuildArch: noarch
License: Apache-2.0
%description -n rust-%{name}+default-devel
This package contains library source intended for building other packages
which use "%{name}" crate with default feature.
%package -n rust-%{name}+gen_conf-devel
Summary: Rust crate of nmstate with default feature
BuildArch: noarch
License: Apache-2.0
%description -n rust-%{name}+gen_conf-devel
This package contains library source intended for building other packages
which use "%{name}" crate with gen_conf feature.
%package -n rust-%{name}+query_apply-devel
Summary: Rust crate of nmstate with query_apply feature
BuildArch: noarch
License: Apache-2.0
# https://bugzilla.redhat.com/show_bug.cgi?id=2161128
Requires: (crate(nispor/default) >= 1.2.12 with crate(nispor/default) < 2.0)
Requires: (crate(nix/default) >= 0.24 with crate(nix/default) < 0.25)
Requires: (crate(zbus/default) >= 1.9 with crate(zbus/default) < 2.0)
%description -n rust-%{name}+query_apply-devel
This package contains library source intended for building other packages
which use "%{name}" crate with query_apply feature.
%package -n rust-%{name}+gen_revert-devel
Summary: Rust crate of nmstate with gen_revert feature
BuildArch: noarch
License: Apache-2.0
%description -n rust-%{name}+gen_revert-devel
This package contains library source intended for building other packages
which use "%{name}" crate with gen_revert feature.
%endif
%prep
gpg2 --import --import-options import-export,import-minimal \
%{SOURCE2} > ./gpgkey-mantainers.gpg
@ -192,16 +117,6 @@ pushd rust/src/python
%py3_install
popd
%if ! 0%{?rhel}
# cargo_install has problem on detecting library when running in workspace
# due to bug https://pagure.io/fedora-rust/cargo2rpm/issue/5
# Removing the workspace Cargo.toml will workaround this problem.
rm rust/Cargo.toml
pushd rust/src/lib
%cargo_install
popd
%endif
%files
%doc README.md
%license LICENSE.dependencies
@ -234,23 +149,5 @@ popd
%files static
%{_libdir}/libnmstate.a
%if ! 0%{?rhel}
%files -n rust-%{name}-devel
%license LICENSE
%{cargo_registry}/%{name}-%{version}/
%files -n rust-%{name}+default-devel
%ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml
%files -n rust-%{name}+gen_conf-devel
%ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml
%files -n rust-%{name}+query_apply-devel
%ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml
%files -n rust-%{name}+gen_revert-devel
%ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml
%endif
%changelog
%autochangelog

6
sources
View File

@ -1,4 +1,4 @@
SHA512 (nmstate-2.2.35.tar.gz) = f546d7f99f1bf3ed13bf72c24913d895a01fca466bdd06dcfdbcb21bd3c20b42296bda667984f50e2041358dee1effed4de316e68a4e126c065b09711e3fa490
SHA512 (nmstate-2.2.35.tar.gz.asc) = 5f19e5a9ea80733a82f93e21ab5bec79d78be3b46acb94f1e4b9c490f0af47ff7cb31a4f02784b5604fcdbaecbc6f2d28c1cacb870068b9951abe1aadc196a25
SHA512 (nmstate-vendor-2.2.35.tar.xz) = 8747790b1bf6ff07f415526183772aac38bea1f2e0472c9e17c1876f1a4ae4912edbf66586981a4e608f712fabfb18591e413a14ba23eb651fe1fc60caa50f90
SHA512 (nmstate-2.2.36.tar.gz) = 5255e3e5a9eb2b0b6950fba8d3defc340b0e027f1888022c9281549d034731c1a69dbdbf7e4752e4665a8c5f13f4c53c1f74dd10dd9fa5f5006f151b67c673ab
SHA512 (nmstate-2.2.36.tar.gz.asc) = 249f4ebaad74d3398d6f41e491633ab0d5a9659bfa361882feb2055289126fabd773e2e8636575f0ecb3c98d09a663ebb2132051483498e7edd7b883c14d09f1
SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3
SHA512 (nmstate-vendor-2.2.36.tar.xz) = 852f53146fb1c7ad1ec86b94635f071fc9579bee8015d8b6fbe89aad274eec64c76b5dbe9795f4127d5b5d4afe6f3206add318443d70e40cc8d9981f6272129f