Merge branch 'rawhide' into f36

This commit is contained in:
Gris Ge 2023-03-13 08:26:09 +08:00
commit 71d108bb96
3 changed files with 15 additions and 5 deletions

6
.gitignore vendored
View file

@ -83,3 +83,9 @@
/nmstate-2.2.2.tar.gz.asc
/nmstate-2.2.3.tar.gz.asc
/nmstate-2.2.3.tar.gz
/nmstate-2.2.4.tar.gz
/nmstate-2.2.4.tar.gz.asc
/nmstate-2.2.5.tar.gz
/nmstate-2.2.5.tar.gz.asc
/nmstate-2.2.8.tar.gz
/nmstate-2.2.8.tar.gz.asc

View file

@ -2,8 +2,8 @@
%define libname libnmstate
Name: nmstate
Version: 2.2.3
Release: 2%{?dist}
Version: 2.2.8
Release: %autorelease
Summary: Declarative network manager API
License: LGPLv2+
URL: https://github.com/%{srcname}/%{srcname}
@ -29,7 +29,7 @@ BuildRequires: (crate(env_logger/default) >= 0.9 with crate(env_logger/default)
BuildRequires: (crate(ipnet/default) >= 2.5 with crate(ipnet/default) < 3.0)
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.9 with crate(nispor/default) < 2.0)
BuildRequires: (crate(nispor/default) >= 1.2.10 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)
@ -164,6 +164,10 @@ pushd rust/src/python
%py3_install
popd
# 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

View file

@ -1,3 +1,3 @@
SHA512 (nmstate.gpg) = 91c6b1d8aef4944520d4bdd4e90121bbbbaf772444f5eb6081cee81e17b21b66798437cdc09a117c6fc77c54d798aaa30400857aa090cb2102b47841f45cf6eb
SHA512 (nmstate-2.2.3.tar.gz.asc) = b083f62a0eaade25cd7a1b43e3b4c9444410bd0f46eb3e75df9598d29902956349cd2cf204755dc74838afc50dd50da25dbdc9d7f799fe0d4b2c6d1f14e386fa
SHA512 (nmstate-2.2.3.tar.gz) = 98fefc539a60bbb78071de9389001b47a8d56784cc5fdf4fe621125c3f00587f7ad4adcb2d99b9eb5de6cc8c9dd3cf1865e8c2b8f2dad1b95b5d6d390cff5ade
SHA512 (nmstate-2.2.8.tar.gz) = ae13d09001794b002c26bf38892a8502c3b3519f56f0dd15a9d81e7590f3d49d52366b3d2d872dc634c97af2cee8c6866c173dd8f915291702192a487b565213
SHA512 (nmstate-2.2.8.tar.gz.asc) = 1da865d78cf907300c302d3fbb208d29e8139d5d59adc662c0885e7882c396de72b7172df9bee35acb8f71b15e76259edbac5bb5972d7d359abfbee1e9fe437e