From ef31f52d33c6ba251c1055cc99c903d72f9a8e4a Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Fri, 7 Jun 2024 11:23:32 +0200
Subject: [PATCH 1/2] Rebuilt for Python 3.13


From 95dab51ed01141c5b31f1316e5d5a717969fbd4b Mon Sep 17 00:00:00 2001
From: Gris Ge <fge@redhat.com>
Date: Thu, 13 Jun 2024 17:19:15 +0800
Subject: [PATCH 2/2] Upgrade to 2.2.33

Signed-off-by: Gris Ge <fge@redhat.com>
---
 .gitignore   |  3 +++
 nmstate.spec | 21 +++++++++++++++------
 sources      |  6 +++---
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index beaeb95..778767f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -112,3 +112,6 @@
 /nmstate-2.2.26.tar.gz
 /nmstate-2.2.26.tar.gz.asc
 /nmstate-vendor-2.2.26.tar.xz
+/nmstate-2.2.33.tar.gz
+/nmstate-2.2.33.tar.gz.asc
+/nmstate-vendor-2.2.33.tar.xz
diff --git a/nmstate.spec b/nmstate.spec
index ecf602c..fd1f79a 100644
--- a/nmstate.spec
+++ b/nmstate.spec
@@ -2,7 +2,7 @@
 %define libname libnmstate
 
 Name:           nmstate
-Version:        2.2.26
+Version:        2.2.33
 Release:        %autorelease
 Summary:        Declarative network manager API
 License:        Apache-2.0 AND LGPL-2.1-or-later
@@ -23,7 +23,6 @@ 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(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)
@@ -38,6 +37,10 @@ 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
@@ -190,11 +193,17 @@ pushd rust/src/python
 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
+# Fedora cargo2rpm has problem when working with worksace dependency
+#   https://pagure.io/fedora-rust/cargo2rpm/issue/13
+# we use `cargo package` to generate the expanded Cargo.toml which
+# is also the one used in crates.io
+cargo package --frozen --no-verify --target-dir %{_tmppath}
+tar xf %{_tmppath}/package/nmstate-%{version}.crate \
+  nmstate-%{version}/Cargo.toml
+mv nmstate-%{version}/Cargo.toml ./Cargo.toml
+# Remove worksapce Cargo.toml
+rm ../../Cargo.toml
 %cargo_install
 popd
 %endif
diff --git a/sources b/sources
index c2aaa63..48c1ab5 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (nmstate-2.2.26.tar.gz) = 52ff3f35ea514018be2dec5d83cc42ad3ed13cf93c6ac72b838ff4218e51d364abbc3f0b33feb9971cda2bc9eb8f76374c0fe66b614f311a71196900117a83fd
-SHA512 (nmstate-2.2.26.tar.gz.asc) = a1cebb3221a7222188b41e348201364189b0c3b35de4964ec5fb83a13b0976bbb17fc831662bfbbf0b9461288c146551c56c6d57862dc4333d848f19ce4194e5
+SHA512 (nmstate-2.2.33.tar.gz) = edf7b7bad2692f323c2d0517c55cd4ce769dc333b99cd39e590e9689c804ae4861da601da005299896e7b5bfba17bfbbe73ceb57066d988c43876c540ee99119
+SHA512 (nmstate-2.2.33.tar.gz.asc) = 32704b7d0661b926f9ac452eeed371025a73237c6810d06120284746c619781f17279b6b2cb17274ade234bf6ed5675f3a03d9752d572b3c7d127bbbb70efaad
+SHA512 (nmstate-vendor-2.2.33.tar.xz) = 8e0136edac1b6789c9d30c2c1b83615e7683ec6961698bf3219aa4aa3f6cd9ca80db47092ed3a0e17515b9278b95cfd62befd6fb24e28a65c03ef713f8f9dd89
 SHA512 (nmstate.gpg) = bfbf3620045f3c1f15eaf6877fd7407834a75d2650976f2327abd02ddb910aa34500f07a774dd17023c43dcba42a0ffc66f23cd6816fd9694acad2c5eed9e8d3
-SHA512 (nmstate-vendor-2.2.26.tar.xz) = 80cbb3e73a55ae602edb3f4538ef87f1b441d149e7bed53fad60828f811d19450d4882a86521c0147d5d9a932c6d5b9595803d919ab1bc7622d29a36c289446a