import nmstate-2.2.38-2.el10

3 months ago · 13ca2a3825
parent 2e198aca6d
commit 13ca2a3825
6 changed files with 80 additions and 127 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/nmstate-2.2.35.tar.gz
-SOURCES/nmstate-vendor-2.2.35.tar.xz
+SOURCES/nmstate-2.2.38.tar.gz
+SOURCES/nmstate-vendor-2.2.38.tar.xz
--- a/.nmstate.metadata
+++ b/.nmstate.metadata
@ -1,2 +1,2 @@
-4a79e45ce04fd38378cbd4352ac82ff2faee0c74 SOURCES/nmstate-2.2.35.tar.gz
-b852e7200d939dea56a9654b082915d7338d363b SOURCES/nmstate-vendor-2.2.35.tar.xz
+1ed6cb6634718a341f7cdba1a9880f6264daee00 SOURCES/nmstate-2.2.38.tar.gz
+8ae29e669011cb50defeab90d0a4724d259381bb SOURCES/nmstate-vendor-2.2.38.tar.xz
--- a/SOURCES/nmstate-2.2.35.tar.gz.asc
+++ b/SOURCES/nmstate-2.2.35.tar.gz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEESP1vrlFad7SENoIch4lWe4cVzrwFAmbGq3oACgkQh4lWe4cV
-zrzT6xAA3cDVUbuxwurEXtbKu6ijbZYBWS7/JA9j6LreFqUxPB02UjrivYwX8l5/
-qAsk0QmD6Hyfs2wmh+nSfxGDqYywgc4WunS19oQSZ4ZUF6GoK9r6JiqS1OzNRZpW
-dI3ylSvXoG8aVrEiBxwlqNcjk7ustKIufR8gImsL5bDEBv9HWBe1wiqxxUXe5hHw
-T7lKg9trfysqmrNDpbBhgN6OQ/G9OgIFjY0VO8Tbaq31GpaVVMLQyhGrRKgN6C6S
-YBSI6wmT8z8hfmChaPmdm9YkYG7CicGFCn6eq9fLyEEhrjieTSMaxF6Ok+0TEIyi
-P0q58XKX3P46NuQO+MnRcggJyrbZtGbLR5INxys+U2kC9N1SFlUL9UqyxH/3TkfQ
-9dwSPBlcYGwAZ2t5BpddfPyYTomvXKeP4037PKlntDmVuhuE4rMljZxnl1K1H/Ug
-vu9ZWev21e/x9w9bLw74ecIDnqOTJjvNaENb1zEyzWuWloagjMpJy8GwyU7zWJ14
-2KvGRSA9uOHMntYWCtTgM/eX0oVuiVQy6TLyFgAs6zHUEqrefkNyhxNfg2HgUVgu
-TvDSXC2p4p2GQOVWoG1pX/c4xHX4rL/O9HZhzNF4NfdhQfYarL1JK6KV9Ys5Rw7Z
-b5PXamR3iOCalPEWMuRF/igqfDT9NrLOOzkkLtbZZ/LMSTjxH5o=
-=Vo1b
-----END PGP SIGNATURE-----
--- a/SOURCES/nmstate-2.2.38.tar.gz.asc
+++ b/SOURCES/nmstate-2.2.38.tar.gz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEESP1vrlFad7SENoIch4lWe4cVzrwFAmcZrvAACgkQh4lWe4cV
+zry4KQ/8Ddu94No0vFMe6xws+WEOfov20P90OU9GGK7Qr9Cp1rVvoIzQSWpohzpN
+ETryp0zOBM5C2+khBqvFx6lflm99kjkVEcRpxLzvwy0Bxq16v5MKDg/zILtntDiB
+WLxzThU5wtg7wUOebR63khEq28bxJjl4AGjmuXzuhWI/8acLiMl7QzG4+w7wxKti
+BagzMIVXh30AM/52loi/TDI0IQGtVT1/p/OCitds4r/Ps+0ekUXaULq+Bo9yRuZK
+lDpAk+Ho6PAcb+wDdkJSWeGiepAbjhilLtInW02jx6YgBtuxFYoIXjrJVL9h7AWx
+6AYLWwv/6O1zUgfU18VSBKkKq6JKJS7ryUCiy644whuqu9mLLJtgyJSzq3a5DV+A
+1ymmsGZDX+fWPK34dYIYznkf/6slNTJ1g5O4mRH0epQNpTNgwPBHe5vkx413AySH
+JnM/mNU0BD/L9YyiD420/PxtNO6OvDgzEc8Sm+PLRH1NpbVN/5THmxRi33H5/K9x
+4UDWIYVriBFNy/LJfRMta11IGM+3paoTNqzxEhaFPjeTM6s9lUZH8sOPtmHK6F02
+mphlfSvjGgWVghB2rT71XiBPGmMtRB6zj2N3CTgetBh2vC8oMWn4P/2K0LdQtUv7
+fZPtxxnvs8z5duIY+cuq3C5UZsXdAh1HQfXCp0lHb4C4kERDSlk=
+=+ZQ5
+-----END PGP SIGNATURE-----
--- a/SOURCES/nmstate.gpg
+++ b/SOURCES/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-----
--- a/SPECS/nmstate.spec
+++ b/SPECS/nmstate.spec
@ -2,7 +2,7 @@
 ## (rpmautospec version 0.6.5)
 ## RPMAUTOSPEC: autorelease, autochangelog
 %define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 1;
+    release_number = 2;
    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
    print(release_number + base_release_number - 1);
 }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
@ -12,7 +12,7 @@
 %define libname libnmstate

 Name:           nmstate
-Version:        2.2.35
+Version:        2.2.38
 Release:        %autorelease
 Summary:        Declarative network manager API
 License:        Apache-2.0 AND LGPL-2.1-or-later
@ -21,37 +21,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
@ -110,57 +86,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
@ -202,16 +127,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
@ -244,26 +159,17 @@ 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
+%changelog
+## START: Generated by rpmautospec
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.2.38-2
+- Bump release for October 2024 mass rebuild:

-%files -n rust-%{name}+gen_conf-devel
-%ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml
+* Thu Oct 24 2024 Gris Ge <fge@redhat.com> - 2.2.38-1
+- Upgrade to 2.2.38

-%files -n rust-%{name}+query_apply-devel
-%ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml
+* Tue Sep 24 2024 Gris Ge <fge@redhat.com> - 2.2.36-1
+- Upgrade to 2.2.36

-%files -n rust-%{name}+gen_revert-devel
-%ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml
-%endif
-
-%changelog
-## START: Generated by rpmautospec
 * Thu Aug 22 2024 Gris Ge <fge@redhat.com> - 2.2.35-1
 - Upgrade to 2.2.35